diff options
-rw-r--r-- | Android.bp | 8 | ||||
-rw-r--r-- | cmds/statsd/Android.bp | 2 | ||||
-rw-r--r-- | core/proto/android/stats/devicepolicy/Android.bp | 2 | ||||
-rw-r--r-- | core/res/Android.bp | 2 | ||||
-rw-r--r-- | media/Android.bp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp index fad4ef1d260e..80322de7fcf4 100644 --- a/Android.bp +++ b/Android.bp @@ -741,7 +741,7 @@ java_defaults { "core/java/android/content/pm/AndroidTestBaseUpdater.java", ], - no_framework_libs: true, + sdk_version: "core_platform", libs: [ "ext", "updatable_media_stubs", @@ -945,7 +945,7 @@ filegroup { java_library { name: "ext", installable: true, - no_framework_libs: true, + sdk_version: "core_platform", static_libs: [ "libphonenumber-platform", "nist-sip", @@ -1169,7 +1169,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", @@ -1704,7 +1704,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: [ diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 6bedfcdfafa3..2f0dc3cb1e98 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -333,7 +333,7 @@ cc_benchmark { // ==== java proto device library (for test only) ============================== java_library { name: "statsdprotolite", - no_framework_libs: true, + sdk_version: "core_platform", proto: { type: "lite", include_dirs: ["external/protobuf/src"], diff --git a/core/proto/android/stats/devicepolicy/Android.bp b/core/proto/android/stats/devicepolicy/Android.bp index 6ae54e23117d..5fb278a34dae 100644 --- a/core/proto/android/stats/devicepolicy/Android.bp +++ b/core/proto/android/stats/devicepolicy/Android.bp @@ -29,5 +29,5 @@ java_library_static { static_libs: ["libprotobuf-java-nano"], } }, - no_framework_libs: true, + sdk_version: "core_platform", } diff --git a/core/res/Android.bp b/core/res/Android.bp index 4e60f8ca025c..3402033b04f1 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -16,7 +16,7 @@ android_app { name: "framework-res", - no_framework_libs: true, + sdk_version: "core_platform", certificate: "platform", // Soong special-cases framework-res to install this alongside diff --git a/media/Android.bp b/media/Android.bp index 70dacb20cde7..4f9671f9936b 100644 --- a/media/Android.bp +++ b/media/Android.bp @@ -27,7 +27,7 @@ java_library { installable: true, // Make sure that the implementaion only relies on SDK or system APIs. - no_framework_libs: true, + sdk_version: "core_platform", libs: [ // The order matters. android_system_* library should come later. "framework_media_annotation", |