Skip to content

Commit

Permalink
Set apex_available property
Browse files Browse the repository at this point in the history
The marked library(ies) were available to the APEXes via the hand-written
whitelist in build/soong/apex/apex.go. Trying to remove the whitelist
by adding apex_available property to the Android.bp of the libraries.

In this change, following libs were made available to all apexes because
their usage is quite common and there is no reason to restrict them
to some APEXes.

* libbase_headers
* libcutils, libcutils_headers
* libutils_headers, libsystem_headers
* liblog_headers
* libbacktrace, libbacktrace_headers
* libcrypto_utils

Exempt-From-Owner-Approval: cherry-pick from aosp

Bug: 150999716
Test: m
Merged-In: If3d3652e6604ed4f6d7694fe7ac61ae496621026
(cherry picked from commit 8bf9b1632e4fadc6e960fa6697037c8fc6401a5c)
Change-Id: If3d3652e6604ed4f6d7694fe7ac61ae496621026

Former-commit-id: a206b8cbf4f1fcbecde649c62aba42ef2b66620a
  • Loading branch information
jiyongp committed Apr 20, 2020
1 parent b7be63a commit 52c97f4
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 0 deletions.
4 changes: 4 additions & 0 deletions base/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ cc_library_headers {
enabled: true,
},
},
apex_available: [
"//apex_available:anyapex",
"//apex_available:platform",
],
}

cc_defaults {
Expand Down
8 changes: 8 additions & 0 deletions libbacktrace/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ cc_library_headers {
recovery_available: true,
native_bridge_supported: true,
export_include_dirs: ["include"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
}

cc_defaults {
Expand Down Expand Up @@ -92,6 +96,10 @@ cc_library {
name: "libbacktrace",
vendor_available: false,
recovery_available: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
vndk: {
enabled: true,
support_system_process: true,
Expand Down
4 changes: 4 additions & 0 deletions libcrypto_utils/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,8 @@ cc_library {
enabled: true,
},
},
apex_available: [
"//apex_available:platform",
"com.android.adbd",
],
}
8 changes: 8 additions & 0 deletions libcutils/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ cc_library_headers {
vendor_available: true,
recovery_available: true,
host_supported: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
native_bridge_supported: true,
export_include_dirs: ["include"],
target: {
Expand Down Expand Up @@ -134,6 +138,10 @@ cc_library {
},
recovery_available: true,
host_supported: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
native_bridge_supported: true,
srcs: [
"config_utils.cpp",
Expand Down
4 changes: 4 additions & 0 deletions liblog/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ cc_library_headers {
vendor_available: true,
ramdisk_available: true,
recovery_available: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
native_bridge_supported: true,
export_include_dirs: ["include"],
system_shared_libs: [],
Expand Down
4 changes: 4 additions & 0 deletions libsystem/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ cc_library_headers {
recovery_available: true,
host_supported: true,
native_bridge_supported: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
export_include_dirs: ["include"],

target: {
Expand Down
4 changes: 4 additions & 0 deletions libutils/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ cc_library_headers {
recovery_available: true,
host_supported: true,
native_bridge_supported: true,
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],

header_libs: [
"liblog_headers",
Expand Down

0 comments on commit 52c97f4

Please sign in to comment.