summaryrefslogtreecommitdiff
path: root/java/sdk_test.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-06-11 13:40:47 +0100
committerPaul Duffin <paulduffin@google.com>2019-06-17 11:21:39 +0100
commita3d0986cfc352eb784d659825ff93772963dcbd5 (patch)
tree8494c7f0a31188a53c7cc5e0cb4d72763f698489 /java/sdk_test.go
parent301ba52886bcfdc8d019ad1af2a391d895cd8f07 (diff)
Remove the no_standard_libs property
Corrects an error message that refers to no_standard_libs. Removes any tests that use no_standard_libs:true where possible as there are duplicate tests for sdk_version:"none". Otherwise, switches them over to use sdk_version:"none". The androidmk mapping from LOCAL_NO_STANDARD_LIBRARIES to no_standard_libs has also been removed. There was little point in updating the tool to map it through to sdk_version:"none" as there are only a couple of places where it is used, in art's test running mk targets and in some unbundled packages to work around some limitation in .mk based build. Bug: 134566750 Test: m droid Change-Id: I6413c9b1fe3e63b93753a6a017d2981e32b7e013
Diffstat (limited to 'java/sdk_test.go')
-rw-r--r--java/sdk_test.go22
1 files changed, 0 insertions, 22 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go
index 1efe83b74..32de8802a 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -113,14 +113,6 @@ func TestClasspath(t *testing.T) {
},
{
- name: "nostdlib - no_standard_libs: true",
- properties: `no_standard_libs: true, system_modules: "none"`,
- system: "none",
- bootclasspath: []string{`""`},
- classpath: []string{},
- },
- {
-
name: "nostdlib",
properties: `sdk_version: "none", system_modules: "none"`,
system: "none",
@@ -129,14 +121,6 @@ func TestClasspath(t *testing.T) {
},
{
- name: "nostdlib system_modules - no_standard_libs: true",
- properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`,
- system: "core-platform-api-stubs-system-modules",
- bootclasspath: []string{`""`},
- classpath: []string{},
- },
- {
-
name: "nostdlib system_modules",
properties: `sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules"`,
system: "core-platform-api-stubs-system-modules",
@@ -161,12 +145,6 @@ func TestClasspath(t *testing.T) {
bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"},
},
{
- name: "host supported nostdlib - no_standard_libs: true",
- host: android.Host,
- properties: `host_supported: true, no_standard_libs: true, system_modules: "none"`,
- classpath: []string{},
- },
- {
name: "host supported nostdlib",
host: android.Host,
properties: `host_supported: true, sdk_version: "none", system_modules: "none"`,