summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-10-08 05:33:29 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-10-08 05:33:29 +0000
commit5bcceefd3c190c49655db6b8227f9eb4e841d7b8 (patch)
tree15b8e06c44d97a37976bd88d4b211982da843eca
parent236f2f826d1cb7253a4978bfb92438fd6819358d (diff)
parent973592eba59f16f58e8930f34c60a157933fc36e (diff)
downloadnative-5bcceefd3c190c49655db6b8227f9eb4e841d7b8.tar.gz
Merge changes from topic "apex_available"
* changes: Remove apex_test_build_features Use apex_available instead of no_apex
-rw-r--r--libs/binder/Android.bp7
1 files changed, 6 insertions, 1 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 296e3f6c53..643a956b4a 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -71,7 +71,12 @@ cc_library {
// libbinder does not offer a stable wire protocol.
// if a second copy of it is installed, then it may break after security
// or dessert updates. Instead, apex users should use libbinder_ndk.
- no_apex: true,
+ apex_available: [
+ "//apex_available:platform",
+ // TODO(b/139016109) remove these three
+ "com.android.media.swcodec",
+ "test_com.android.media.swcodec",
+ ],
srcs: [
"Binder.cpp",