diff options
| author | Jiyong Park <jiyong@google.com> | 2020-03-07 17:08:16 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2020-03-23 12:01:42 +0900 |
| commit | a50bedbdb3291dd5f029fd1303ad309ccb2d6eb1 (patch) | |
| tree | 54a59b0dba044e8d5532b66774f1c40c362804e6 | |
| parent | 247616f2154f29f8cd1894dec24452fafa9563fd (diff) | |
| download | protobuf-a50bedbdb3291dd5f029fd1303ad309ccb2d6eb1.tar.gz | |
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 | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 659525e1f..89d97ee4c 100644 --- a/Android.bp +++ b/Android.bp @@ -114,8 +114,7 @@ cc_library { }, apex_available: [ "//apex_available:platform", - "com.android.adbd", - "test_com.android.adbd", + "//apex_available:anyapex", ], } @@ -447,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) @@ -468,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) @@ -580,6 +591,12 @@ java_library_static { }, java_version: "1.7", + + apex_available: [ + "//apex_available:platform", + // TODO(b/151068271) switch below to //apex_available:anyapex + "com.android.bluetooth.updatable", + ], } // Java lite library (compatibility for old host-side users) |