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
This commit is contained in:
@@ -111,14 +111,6 @@ func TestClasspath(t *testing.T) {
|
||||
bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},
|
||||
system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
|
||||
},
|
||||
{
|
||||
|
||||
name: "nostdlib - no_standard_libs: true",
|
||||
properties: `no_standard_libs: true, system_modules: "none"`,
|
||||
system: "none",
|
||||
bootclasspath: []string{`""`},
|
||||
classpath: []string{},
|
||||
},
|
||||
{
|
||||
|
||||
name: "nostdlib",
|
||||
@@ -127,14 +119,6 @@ func TestClasspath(t *testing.T) {
|
||||
bootclasspath: []string{`""`},
|
||||
classpath: []string{},
|
||||
},
|
||||
{
|
||||
|
||||
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",
|
||||
@@ -160,12 +144,6 @@ func TestClasspath(t *testing.T) {
|
||||
classpath: []string{},
|
||||
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,
|
||||
|
Reference in New Issue
Block a user