From ff0daf4ccf2f1ef65dad34a971a1f3c65827f744 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 2 Apr 2019 16:10:56 -0700 Subject: 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 --- java/java_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'java/java_test.go') 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, -- cgit v1.2.3-59-g8ed1b