Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace no_framework_libs: true with sdk_version: "core_platform"" into qt-dev-plus-aosp

Browse Source 
am: 23b3ebfd24

Change-Id: Iad64ba777e996861fff3062a37c150a35a6d3618
This commit is contained in:
Paul Duffin
2019-06-19 05:52:56 -07:00
committed by android-build-merger
parent 823a5388d2 23b3ebfd24
commit 4575c69608
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.bp
View File

@@ -741,7 +741,7 @@ java_defaults {
"core/java/android/content/pm/AndroidTestBaseUpdater.java", "core/java/android/content/pm/AndroidTestBaseUpdater.java",
], ],
no_framework_libs: true, sdk_version: "core_platform",
libs: [ libs: [
"ext", "ext",
"updatable_media_stubs", "updatable_media_stubs",
@@ -945,7 +945,7 @@ filegroup {
java_library { java_library {
name: "ext", name: "ext",
installable: true, installable: true,
no_framework_libs: true, sdk_version: "core_platform",
static_libs: [ static_libs: [
"libphonenumber-platform", "libphonenumber-platform",
"nist-sip", "nist-sip",
@@ -1169,7 +1169,7 @@ optional_subdirs = [
// updated to use hwbinder.stubs. // updated to use hwbinder.stubs.
java_library { java_library {
name: "hwbinder", name: "hwbinder",
no_framework_libs: true, sdk_version: "core_platform",
srcs: [ srcs: [
"core/java/android/os/HidlSupport.java", "core/java/android/os/HidlSupport.java",
@@ -1704,7 +1704,7 @@ droidstubs {
"core/java/android/util/AndroidException.java", "core/java/android/util/AndroidException.java",
], ],
installable: false, installable: false,
no_framework_libs: true, sdk_version: "core_platform",
annotations_enabled: true, annotations_enabled: true,
previous_api: ":last-released-public-api", previous_api: ":last-released-public-api",
merge_annotations_dirs: [ merge_annotations_dirs: [

2
cmds/statsd/Android.bp
View File

@@ -333,7 +333,7 @@ cc_benchmark {
// ==== java proto device library (for test only) ============================== // ==== java proto device library (for test only) ==============================
java_library { java_library {
name: "statsdprotolite", name: "statsdprotolite",
no_framework_libs: true, sdk_version: "core_platform",
proto: { proto: {
type: "lite", type: "lite",
include_dirs: ["external/protobuf/src"], include_dirs: ["external/protobuf/src"],

2
core/proto/android/stats/devicepolicy/Android.bp
View File

@@ -29,5 +29,5 @@ java_library_static {
static_libs: ["libprotobuf-java-nano"], static_libs: ["libprotobuf-java-nano"],
} }
}, },
no_framework_libs: true, sdk_version: "core_platform",
} }

2
core/res/Android.bp
View File

@@ -16,7 +16,7 @@
android_app { android_app {
name: "framework-res", name: "framework-res",
no_framework_libs: true, sdk_version: "core_platform",
certificate: "platform", certificate: "platform",
// Soong special-cases framework-res to install this alongside // Soong special-cases framework-res to install this alongside

2
media/Android.bp
View File

@@ -27,7 +27,7 @@ java_library {
installable: true, installable: true,
// Make sure that the implementaion only relies on SDK or system APIs. // Make sure that the implementaion only relies on SDK or system APIs.
no_framework_libs: true, sdk_version: "core_platform",
libs: [ libs: [
// The order matters. android_system_* library should come later. // The order matters. android_system_* library should come later.
"framework_media_annotation", "framework_media_annotation",