From 750e557011f9bc240276f8bca7d1caca800a7953 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 31 Jan 2018 00:20:13 +0900 Subject: Support sdk_version: "core_current" core_current is a pseudo SDK version which is a core Java API subset of the Android API. It is expected to be mainly used for external Java projects which are agnostic to Android; such as junit, guava, etc. A module built with this SDK version can only link to java modules of the same kind. It can't depend on modules built with other sdk (e.g. current) or without sdk. Bug: 72206056 Test: m -j Change-Id: I778e7b4fcb9456a12b418ffd633ea78e29951e84 --- java/java_test.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index db0b7a732..60d9a4082 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -146,6 +146,7 @@ func testContext(config android.Config, bp string, "prebuilts/sdk/14/framework.aidl": nil, "prebuilts/sdk/current/android.jar": nil, "prebuilts/sdk/current/framework.aidl": nil, + "prebuilts/sdk/current/core.jar": nil, "prebuilts/sdk/system_current/android.jar": nil, "prebuilts/sdk/system_current/framework.aidl": nil, "prebuilts/sdk/system_14/android.jar": nil, @@ -360,6 +361,14 @@ var classpathTestcases = []struct { system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath classpath: []string{"prebuilts/sdk/test_current/android.jar"}, }, + { + + name: "core_current", + properties: `sdk_version: "core_current",`, + bootclasspath: []string{`""`}, + system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath + classpath: []string{"prebuilts/sdk/current/core.jar"}, + }, { name: "nostdlib", -- cgit v1.2.3-59-g8ed1b