diff options
| author | Jiyong Park <jiyong@google.com> | 2020-03-07 17:08:16 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-03-23 14:03:00 +0900 |
| commit | 4c1ea7f7f5b4c35cf68d1dd6eef1462db7c5ca5c (patch) | |
| tree | 7fda7c050799be738c176ba145cdb5f57804d7b5 | |
| parent | 9424334b824b0611b7301d08f0c45750bbb589fd (diff) | |
| download | platform_external_protobuf-4c1ea7f7f5b4c35cf68d1dd6eef1462db7c5ca5c.tar.gz platform_external_protobuf-4c1ea7f7f5b4c35cf68d1dd6eef1462db7c5ca5c.tar.bz2 platform_external_protobuf-4c1ea7f7f5b4c35cf68d1dd6eef1462db7c5ca5c.zip | |
Set apex_available property
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.
Exempt-From-Owner-Approval: cp from master
Bug: 150999716
Test: m
Merged-In: I20a6ef3e3a95c5ebce63666e7b88623997623083
(cherry picked from commit dd6f59aad67e08ade1436125acd7008e2c75404b)
Change-Id: I20a6ef3e3a95c5ebce63666e7b88623997623083
| -rw-r--r-- | Android.bp | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/Android.bp b/Android.bp index 56e97106d..2149ee335 100644 --- a/Android.bp +++ b/Android.bp @@ -114,10 +114,7 @@ cc_library { }, apex_available: [ "//apex_available:platform", - "com.android.adbd", - "test_com.android.adbd", - "com.android.os.statsd", - "test_com.android.os.statsd", + "//apex_available:anyapex", ], } @@ -449,6 +446,12 @@ java_library_static { }, java_version: "1.7", + + apex_available: [ + "//apex_available:platform", + // TODO(b/151068271) switch this to //apex_available:anyapex + "com.android.wifi", + ], } // Java nano library (compatibility for old host-side users) @@ -470,6 +473,12 @@ java_library_static { sdk_version: "8", srcs: ["javamicro/src/main/java/com/google/protobuf/micro/**/*.java"], + + apex_available: [ + "//apex_available:platform", + // TODO(b/151068271) switch this to //apex_available:anyapex + "com.android.bluetooth.updatable", + ], } // Java micro library (compatibility for old host-side users) @@ -582,6 +591,13 @@ java_library_static { }, java_version: "1.7", + + apex_available: [ + "//apex_available:platform", + // TODO(b/151068271) switch below to //apex_available:anyapex + "com.android.permission", + "com.android.bluetooth.updatable", + ], } // Java lite library (compatibility for old host-side users) |