Switch from no_standard_libs:true to sdk_version:"none"
The no_standard_libs property is deprecated in favor of
sdk_version:"none" as the latter is simpler and less error prone.
Bug: 134566750
Test: m droid
Change-Id: I38166d4d6dfb580a04b794cdb2b910ab221305eb
ge-Id: I138061eb330e0bc17f5ae414f1c3df7979472a6a
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 73c9e11..d92fd69 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -162,7 +162,7 @@
":openjdk_generated_annotation_stub_files",
],
- no_standard_libs: true,
+ sdk_version: "none",
system_modules: "none",
openjdk9: {
srcs: ["luni/src/module/java/module-info.java"],
@@ -207,7 +207,7 @@
srcs: [":core_oj_java_files"],
java_resource_dirs: core_resource_dirs,
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
openjdk9: {
@@ -255,7 +255,7 @@
static_libs: ["android_icu4j_resources_lib"],
java_version: "1.9",
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
openjdk9: {
@@ -317,7 +317,7 @@
srcs: [":openjdk_hiddenapi_javadoc_files"],
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
openjdk9: {
@@ -336,7 +336,7 @@
name: "core-oj-testdex",
installable: true,
static_libs: ["core-oj"],
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
dxflags: ["--core-library"],
@@ -351,7 +351,7 @@
name: "core-libart-testdex",
installable: true,
static_libs: ["core-libart"],
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
dxflags: ["--core-library"],
@@ -366,7 +366,7 @@
defaults: ["libcore_java_defaults"],
hostdex: true,
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
openjdk9: {
@@ -414,7 +414,7 @@
":openjdk_generated_annotation_stub_files",
],
hostdex: true,
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
openjdk9: {
@@ -461,7 +461,7 @@
],
static_libs: ["junit"],
- no_standard_libs: true,
+ sdk_version: "none",
libs: ["core-all"],
system_modules: "core-all-system-modules",
}
@@ -485,7 +485,7 @@
java_test {
name: "jsr166-tests",
srcs: ["jsr166-tests/src/test/java/**/*.java"],
- no_standard_libs: true,
+ sdk_version: "none",
libs: [
"core-all",
"junit",
@@ -528,7 +528,7 @@
":parameter-metadata-test",
],
- no_standard_libs: true,
+ sdk_version: "none",
libs: [
"core-all",
"okhttp",
@@ -575,7 +575,7 @@
"ojluni/src/test/resources",
],
- no_standard_libs: true,
+ sdk_version: "none",
libs: [
"core-all",
"okhttp",
@@ -627,7 +627,7 @@
"ojluni/src/test/dist",
],
- no_standard_libs: true,
+ sdk_version: "none",
libs: [
"core-all",
"bouncycastle",
@@ -696,7 +696,7 @@
openjdk9: {
javacflags: ["--patch-module=java.base=."],
},
- no_standard_libs: true,
+ sdk_version: "none",
system_modules: "none",
dist: {