aboutsummaryrefslogtreecommitdiffstats
path: root/java/java_test.go
diff options
context:
space:
mode:
authorSundong Ahn <sundongahn@google.com>2017-10-17 16:34:51 +0900
committerSundong Ahn <sundongahn@google.com>2017-12-01 00:41:59 +0000
commit0926fae350a86fa1ea008d8fde95391bd6ed0ca0 (patch)
treefecf4611f6f75ff6dbd17b5ea9fb643e832d561c /java/java_test.go
parent85c87cef014bd4369af347ab8a108c0549d569d9 (diff)
downloadandroid_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.tar.gz
android_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.tar.bz2
android_build_soong-0926fae350a86fa1ea008d8fde95391bd6ed0ca0.zip
Add system_$(VER)
The system_$(VER) is added for vendor, similar to sdk. Bug: 67724799 Test: build Merged-In: I2545c92707591ca278066870c74e9f49e9825855 Change-Id: I2545c92707591ca278066870c74e9f49e9825855 (cherry picked from commit b8baff1fa353a311c3dd918dfa29ec45dd0168be)
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/java/java_test.go b/java/java_test.go
index 0a9eba94..5b364279 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -139,6 +139,8 @@ func testJavaWithEnvFs(t *testing.T, bp string,
"prebuilts/sdk/current/framework.aidl": nil,
"prebuilts/sdk/system_current/android.jar": nil,
"prebuilts/sdk/system_current/framework.aidl": nil,
+ "prebuilts/sdk/system_14/android.jar": nil,
+ "prebuilts/sdk/system_14/framework.aidl": nil,
"prebuilts/sdk/test_current/android.jar": nil,
"prebuilts/sdk/test_current/framework.aidl": nil,
@@ -286,6 +288,14 @@ var classpathTestcases = []struct {
},
{
+ name: "system_14",
+ properties: `sdk_version: "system_14",`,
+ bootclasspath: []string{`""`},
+ system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
+ classpath: []string{"prebuilts/sdk/system_14/android.jar"},
+ },
+ {
+
name: "test_current",
properties: `sdk_version: "test_current",`,
bootclasspath: []string{`""`},