From 2ebc47664648985a2f1fd4814ff19122148c6f85 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 20 Oct 2017 14:00:31 -0700 Subject: Use prebuilts/sdk/*current until Soong can generate stubs The android_*stubs_current modules don't yet exist, so fall back to the prebuilt jars for now. Test: m checkbuild Change-Id: Iabd32b30954b3f4a6d9a779fde52a032b684807e --- java/java_test.go | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index bf839835d..451f58e9b 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -123,8 +123,14 @@ func testJavaWithEnv(t *testing.T, bp string, env map[string]string) *android.Te "res/b": nil, "res2/a": nil, - "prebuilts/sdk/14/android.jar": nil, - "prebuilts/sdk/14/framework.aidl": nil, + "prebuilts/sdk/14/android.jar": nil, + "prebuilts/sdk/14/framework.aidl": nil, + "prebuilts/sdk/current/android.jar": nil, + "prebuilts/sdk/current/framework.aidl": nil, + "prebuilts/sdk/system_current/android.jar": nil, + "prebuilts/sdk/system_current/framework.aidl": nil, + "prebuilts/sdk/test_current/android.jar": nil, + "prebuilts/sdk/test_current/framework.aidl": nil, }) _, errs := ctx.ParseBlueprintsFiles("Android.bp") @@ -246,25 +252,25 @@ var classpathTestcases = []struct { name: "current", properties: `sdk_version: "current",`, - bootclasspath: []string{"android_stubs_current"}, - system: "android_stubs_current_system_modules", - classpath: []string{}, + bootclasspath: []string{`""`}, + system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath + classpath: []string{"prebuilts/sdk/current/android.jar"}, }, { name: "system_current", properties: `sdk_version: "system_current",`, - bootclasspath: []string{"android_system_stubs_current"}, - system: "android_system_stubs_current_system_modules", - classpath: []string{}, + bootclasspath: []string{`""`}, + system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath + classpath: []string{"prebuilts/sdk/system_current/android.jar"}, }, { name: "test_current", properties: `sdk_version: "test_current",`, - bootclasspath: []string{"android_test_stubs_current"}, - system: "android_test_stubs_current_system_modules", - classpath: []string{}, + bootclasspath: []string{`""`}, + system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath + classpath: []string{"prebuilts/sdk/test_current/android.jar"}, }, { -- cgit v1.2.3-59-g8ed1b