diff options
| author | Colin Cross <ccross@android.com> | 2018-05-29 14:44:55 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-05-29 23:47:50 +0000 |
| commit | d9d7be0617f37939b1904e6b0b6eca69da63ba5a (patch) | |
| tree | 619857c848db1227175d0f782e9857543cba4eef /java/java_test.go | |
| parent | 4a789b1c3d0c24fe093bbc53341ae469d720fdb0 (diff) | |
Add core-lambda-stubs to classpath
Add core-lambda-stubs to the bootclasspath for modules with no
sdk_version or with sdk_version: "current", and to the classpath
for modules that specify a specific sdk_version number.
Fixes compiling modules with lambdas against the SDK.
Bug: 80428539
Test: java_test.go
Change-Id: I5e700f2dd86f1a6b84b7a55dd9bfe21a448d3fb6
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/java/java_test.go b/java/java_test.go index baf4b723b..03a623bc2 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -98,6 +98,7 @@ func testContext(config android.Config, bp string, extraModules := []string{ "core-oj", "core-libart", + "core-lambda-stubs", "framework", "ext", "okhttp", @@ -347,14 +348,14 @@ var classpathTestcases = []struct { }{ { name: "default", - bootclasspath: []string{"core-oj", "core-libart"}, + bootclasspath: []string{"core-oj", "core-libart", "core-lambda-stubs"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, - bootclasspath: []string{"core-oj", "core-libart"}, + bootclasspath: []string{"core-oj", "core-libart", "core-lambda-stubs"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, @@ -364,20 +365,20 @@ var classpathTestcases = []struct { properties: `sdk_version: "14",`, bootclasspath: []string{`""`}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath - classpath: []string{"prebuilts/sdk/14/public/android.jar"}, + classpath: []string{"prebuilts/sdk/14/public/android.jar", "core-lambda-stubs"}, }, { name: "current", properties: `sdk_version: "current",`, - bootclasspath: []string{"android_stubs_current"}, + bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { name: "system_current", properties: `sdk_version: "system_current",`, - bootclasspath: []string{"android_system_stubs_current"}, + bootclasspath: []string{"android_system_stubs_current", "core-lambda-stubs"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { @@ -386,20 +387,20 @@ var classpathTestcases = []struct { properties: `sdk_version: "system_14",`, bootclasspath: []string{`""`}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath - classpath: []string{"prebuilts/sdk/14/system/android.jar"}, + classpath: []string{"prebuilts/sdk/14/system/android.jar", "core-lambda-stubs"}, }, { name: "test_current", properties: `sdk_version: "test_current",`, - bootclasspath: []string{"android_test_stubs_current"}, + bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { name: "core_current", properties: `sdk_version: "core_current",`, - bootclasspath: []string{"core.current.stubs"}, + bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { |