diff options
| author | Jiyong Park <jiyong@google.com> | 2020-03-23 06:48:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-23 06:48:17 +0000 |
| commit | bcf066daedff36f22b7841ff5844f220b78c0604 (patch) | |
| tree | 0ba78b8877966781eebb77d35b9e1a93ec7ce441 | |
| parent | 24b6fcc913c934395a4482e0d8e52862eeca8016 (diff) | |
| parent | cd3ff8ace107ecdc840338ccae624279033ba70f (diff) | |
| download | protobuf-bcf066daedff36f22b7841ff5844f220b78c0604.tar.gz | |
Merge "Set apex_available property" am: 6645f5c5d0 am: cd3ff8ace1
Change-Id: I6523b685a6de26898248a62e7a67099525ab1f88
| -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) |