summaryrefslogtreecommitdiff
path: root/Android.bp
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2019-06-19 05:57:37 -0700
committer android-build-merger <android-build-merger@google.com> 2019-06-19 05:57:37 -0700
commitfc85dca16eefe824c03f13c913025e07453ec0b4 (patch)
tree57d57b5f68fd5d1f5a394208ce3b970879545713 /Android.bp
parent5f84625a7b0e002f5d2444cf67495440da30bb71 (diff)
parent4575c6960865ded49154e68d384a922f0c77329b (diff)
Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into qt-dev-plus-aosp am: 23b3ebfd24
am: 4575c69608 Change-Id: I01c64024c8d59a607a2a8c6d41aec852b41d4445
Diffstat (limited to 'Android.bp')
-rw-r--r--Android.bp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp
index 8fedc34fb05a..1902a5f1b3ff 100644
--- a/Android.bp
+++ b/Android.bp
@@ -747,7 +747,7 @@ java_defaults {
"core/java/android/content/pm/AndroidTestBaseUpdater.java",
],
- no_framework_libs: true,
+ sdk_version: "core_platform",
libs: [
"ext",
"updatable_media_stubs",
@@ -951,7 +951,7 @@ filegroup {
java_library {
name: "ext",
installable: true,
- no_framework_libs: true,
+ sdk_version: "core_platform",
static_libs: [
"libphonenumber-platform",
"nist-sip",
@@ -1175,7 +1175,7 @@ optional_subdirs = [
// updated to use hwbinder.stubs.
java_library {
name: "hwbinder",
- no_framework_libs: true,
+ sdk_version: "core_platform",
srcs: [
"core/java/android/os/HidlSupport.java",
@@ -1702,7 +1702,7 @@ droidstubs {
"core/java/android/util/AndroidException.java",
],
installable: false,
- no_framework_libs: true,
+ sdk_version: "core_platform",
annotations_enabled: true,
previous_api: ":last-released-public-api",
merge_annotations_dirs: [