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 /JavaLibrary.bp | |
parent | e5e053826ab1bd1a2423c4f5938648e4b67ed86e (diff) | |
parent | 53c491f5c95d829ecd04cad136ae3ba09fcfbc95 (diff) |
Merge "Replace no_framework_libs: true with sdk_version: "core_platform""
Diffstat (limited to 'JavaLibrary.bp')
-rw-r--r-- | JavaLibrary.bp | 6 |
1 files changed, 3 insertions, 3 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 ", |