diff options
| author | Colin Cross <ccross@android.com> | 2019-04-02 16:10:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-02 23:18:30 +0000 |
| commit | ff0daf4ccf2f1ef65dad34a971a1f3c65827f744 (patch) | |
| tree | d39ed037e1b949afb6283157b9058d98b7f80b1d /java/java_test.go | |
| parent | 9a4f3f7ea87d983ddf69831a9e197f6b62d4d873 (diff) | |
Fix sdk_version: "system_current" when Platform_sdk_final=true
When PLATFORM_VERSION_CODENAME is set to REL Platform_sdk_final
becomes true, which causes the return value of sdkVersionToNumber
for "system_current" to a real version number instead of
FutureApiLevel. This enables the check against
PlatformSystemSdkVersions, which doesn't contain "current". Use
the numeric value instead.
Fixes: 129786845
Test: sdk_test.go
Change-Id: If7cf211cc01c5fbf3e3ece3c3f604718a13d5a9b
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go index 6cb481865..2546698bc 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -138,6 +138,9 @@ func testContext(config android.Config, bp string, "prebuilts/sdk/17/public/android.jar": nil, "prebuilts/sdk/17/public/framework.aidl": nil, "prebuilts/sdk/17/system/android.jar": nil, + "prebuilts/sdk/25/public/android.jar": nil, + "prebuilts/sdk/25/public/framework.aidl": nil, + "prebuilts/sdk/25/system/android.jar": nil, "prebuilts/sdk/current/core/android.jar": nil, "prebuilts/sdk/current/public/android.jar": nil, "prebuilts/sdk/current/public/framework.aidl": nil, |