summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-10-07 22:47:37 -0700
committer android-build-merger <android-build-merger@google.com> 2019-10-07 22:47:37 -0700
commit16ca58c16006b0b38cfd67995f0730623e7c54db (patch)
tree84c4345cd179e1962c5a4ca93a9d3b16f7fd46a1
parentb5c360e68a5c1286f757cb8fc14f42df6f8d3dcb (diff)
parent288e14b37cfb817299f19e20aecf2783566a1aca (diff)
Merge changes from topic "apex_available" am: 5bcceefd3c
am: 288e14b37c Change-Id: I32b7187ea9684fa121c08f5e3b7c4d5e6f6bdd54
-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",