diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-06-18 07:32:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-18 07:32:20 +0000 |
| commit | 1cd79b9b588ec6dc1219cbb12f31a93efa8da73f (patch) | |
| tree | 262e01f15557932c340464359928de5ed20ec7bc | |
| parent | e5e053826ab1bd1a2423c4f5938648e4b67ed86e (diff) | |
| parent | 53c491f5c95d829ecd04cad136ae3ba09fcfbc95 (diff) | |
Merge "Replace no_framework_libs: true with sdk_version: "core_platform""
| -rw-r--r-- | JavaLibrary.bp | 6 | ||||
| -rw-r--r-- | luni/src/test/annotations/Android.bp | 2 | ||||
| -rw-r--r-- | luni/src/test/filesystems/Android.bp | 2 | ||||
| -rw-r--r-- | luni/src/test/parameter_metadata/Android.bp | 2 | ||||
| -rw-r--r-- | openjdk_java_files.bp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/JavaLibrary.bp b/JavaLibrary.bp index d92fd69d1c..7041b09f42 100644 --- a/JavaLibrary.bp +++ b/JavaLibrary.bp @@ -472,7 +472,7 @@ java_library_static { hostdex: true, srcs: ["support/src/test/java/**/*.java"], - no_framework_libs: true, + sdk_version: "core_platform", libs: ["junit"], static_libs: [ "bouncycastle-unbundled", @@ -675,7 +675,7 @@ droidstubs { srcs: [":core_api_files"], java_version: "1.9", installable: false, - no_framework_libs: true, + sdk_version: "core_platform", args: " --exclude-annotations " + "--hide-annotation libcore.api.Hide", merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"], @@ -734,7 +734,7 @@ droidstubs { name: "core-current-stubs-nullability-validation", srcs: [":core_api_files"], installable: false, - no_framework_libs: true, + sdk_version: "core_platform", annotations_enabled: true, args: "--hide-annotation libcore.api.Hide " + "--validate-nullability-from-merged-stubs ", diff --git a/luni/src/test/annotations/Android.bp b/luni/src/test/annotations/Android.bp index 0e6f8cc7bb..437d7c4cde 100644 --- a/luni/src/test/annotations/Android.bp +++ b/luni/src/test/annotations/Android.bp @@ -24,6 +24,6 @@ java_library { ], compile_dex: true, srcs: ["src/**/*.java"], - no_framework_libs: true, + sdk_version: "core_platform", dxflags: ["--intermediate"], } diff --git a/luni/src/test/filesystems/Android.bp b/luni/src/test/filesystems/Android.bp index 367e777e4e..8acf4283d3 100644 --- a/luni/src/test/filesystems/Android.bp +++ b/luni/src/test/filesystems/Android.bp @@ -21,7 +21,7 @@ java_library { compile_dex: true, srcs: ["src/**/*.java"], java_resource_dirs: ["resources"], - no_framework_libs: true, + sdk_version: "core_platform", errorprone: { javacflags: ["-Xep:MissingOverride:OFF"], }, diff --git a/luni/src/test/parameter_metadata/Android.bp b/luni/src/test/parameter_metadata/Android.bp index 45edcdb5ff..5e00fa2ebb 100644 --- a/luni/src/test/parameter_metadata/Android.bp +++ b/luni/src/test/parameter_metadata/Android.bp @@ -23,7 +23,7 @@ java_library { name: "parameter-metadata-test", compile_dex: true, srcs: ["src/**/*.java"], - no_framework_libs: true, + sdk_version: "core_platform", javacflags: ["-parameters"], errorprone: { javacflags: ["-Xep:MissingOverride:OFF"], diff --git a/openjdk_java_files.bp b/openjdk_java_files.bp index 334509c3c6..819c8ff493 100644 --- a/openjdk_java_files.bp +++ b/openjdk_java_files.bp @@ -1828,7 +1828,7 @@ droidstubs { name: "openjdk-sdk-stubs-no-javadoc", srcs: [":openjdk_javadoc_files"], installable: false, - no_framework_libs: true, + sdk_version: "core_platform", args: "--exclude-documentation-from-stubs", } @@ -1843,7 +1843,7 @@ droidstubs { ":openjdk_mmodule_extra_files", ], installable: false, - no_framework_libs: true, + sdk_version: "core_platform", args: "--exclude-documentation-from-stubs " + "--hide-annotation libcore.api.Hide ", merge_inclusion_annotations_dirs: ["ojluni-annotated-mmodule-stubs"], |