diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-06-17 21:24:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-17 21:24:33 +0000 |
| commit | 33ee25466f752420ba42f899457b37f402459005 (patch) | |
| tree | b985f857c29e0cee58c6b1a5f07e8ccd744890cb /java/sdk_test.go | |
| parent | 2deb017c04d1982e39dcaef7b96c524c6f493388 (diff) | |
| parent | 50c217c744901bf8a2408f110840bf22225ae361 (diff) | |
Merge changes I42cb181f,I6413c9b1
* changes:
Add sdk_version:"core_platform" to replace no_framework_libs:true
Remove the no_standard_libs property
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index 1efe83b74..915333ec9 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -55,6 +55,14 @@ func TestClasspath(t *testing.T) { aidl: "", }, { + name: `sdk_version:"core_platform"`, + properties: `sdk_version:"core_platform"`, + bootclasspath: config.DefaultBootclasspathLibraries, + system: config.DefaultSystemModules, + classpath: []string{}, + aidl: "", + }, + { name: "blank sdk version", properties: `sdk_version: "",`, bootclasspath: config.DefaultBootclasspathLibraries, @@ -113,14 +121,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 +129,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 +153,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"`, |