diff options
| author | Colin Cross <ccross@android.com> | 2018-05-30 05:45:09 +0000 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-05-30 05:45:09 +0000 |
| commit | 7cdc22edb9e74f5e62d977f5207f14b7d1d1aa87 (patch) | |
| tree | d89017ae7b5cc590c2bab2574c46b70890f17ec9 /java/java_test.go | |
| parent | d9d7be0617f37939b1904e6b0b6eca69da63ba5a (diff) | |
Revert "Add core-lambda-stubs to classpath"
This reverts commit d9d7be0617f37939b1904e6b0b6eca69da63ba5a.
Reason for revert: Broke unbundled builds.
Bug: 80428539
Change-Id: I2279dbd2b11a2f63e70ad89d0b3bc42bca2b676b
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/java/java_test.go b/java/java_test.go index 03a623bc2..baf4b723b 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -98,7 +98,6 @@ func testContext(config android.Config, bp string, extraModules := []string{ "core-oj", "core-libart", - "core-lambda-stubs", "framework", "ext", "okhttp", @@ -348,14 +347,14 @@ var classpathTestcases = []struct { }{ { name: "default", - bootclasspath: []string{"core-oj", "core-libart", "core-lambda-stubs"}, + bootclasspath: []string{"core-oj", "core-libart"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, { name: "blank sdk version", properties: `sdk_version: "",`, - bootclasspath: []string{"core-oj", "core-libart", "core-lambda-stubs"}, + bootclasspath: []string{"core-oj", "core-libart"}, system: "core-system-modules", classpath: []string{"ext", "framework", "okhttp"}, }, @@ -365,20 +364,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", "core-lambda-stubs"}, + classpath: []string{"prebuilts/sdk/14/public/android.jar"}, }, { name: "current", properties: `sdk_version: "current",`, - bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"}, + bootclasspath: []string{"android_stubs_current"}, 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", "core-lambda-stubs"}, + bootclasspath: []string{"android_system_stubs_current"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { @@ -387,20 +386,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", "core-lambda-stubs"}, + classpath: []string{"prebuilts/sdk/14/system/android.jar"}, }, { name: "test_current", properties: `sdk_version: "test_current",`, - bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"}, + bootclasspath: []string{"android_test_stubs_current"}, 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", "core-lambda-stubs"}, + bootclasspath: []string{"core.current.stubs"}, system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath }, { |