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
diff --git a/java/java_test.go b/java/java_test.go
index bf83983..451f58e 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -123,8 +123,14 @@
"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 @@
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"},
},
{