diff options
| author | Colin Cross <ccross@android.com> | 2017-10-21 03:37:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-21 03:37:46 +0000 |
| commit | 730bb0113cb906e2ad51a6ab5fad6a3f0fb2de21 (patch) | |
| tree | 818b7bbb262b1074bc27a4c1f6f48b0f9ebfae74 /java/java_test.go | |
| parent | 6c1b2c14f8af9c4b5bdd6b749d35bd5b61ecbbb5 (diff) | |
| parent | 2ebc47664648985a2f1fd4814ff19122148c6f85 (diff) | |
Use prebuilts/sdk/*current until Soong can generate stubs
am: 2ebc476646
Change-Id: Ia32894aa7ac8a62ccef2aa0b5017114d403de622
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 28 |
1 files changed, 17 insertions, 11 deletions
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"}, }, { |