From 0926fae350a86fa1ea008d8fde95391bd6ed0ca0 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Tue, 17 Oct 2017 16:34:51 +0900 Subject: 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) --- java/java_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'java/java_test.go') 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, @@ -284,6 +286,14 @@ var classpathTestcases = []struct { system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath classpath: []string{"prebuilts/sdk/system_current/android.jar"}, }, + { + + 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", -- cgit v1.2.3