commit c5ccfacddc148744ef5a5e04b6b353f25637663c
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 22 02:02:03 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 22 02:02:03 2020 +0000
tree 7002a92510d0452a315c42ef5b70ea7a67fd1dd6
parent 9ad997f85a89ed1545a293cf999555f0632a9321
parent e10f849e282386fb429634185ffdeb8002ef7d7b

Snap for 6415107 from e10f849e282386fb429634185ffdeb8002ef7d7b to rvc-d1-release

Change-Id: I70bdddcb0bfc79e01ebc5e873bf8b8d5284f2aa5

Android.bp

diff --git a/Android.bp b/Android.bp
index aea2a03..62b88dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -59,6 +59,11 @@
         "-Wall",
         "-Werror",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_genrule {
@@ -69,6 +74,11 @@
     cmd: "$(location gen_syscalls.sh) $(in) $(out)",
     srcs: [":libminijail_gen_syscall_obj"],
     out: ["libsyscalls.c"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_object {
@@ -82,6 +92,11 @@
         "-Wall",
         "-Werror",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_genrule {
@@ -92,6 +107,11 @@
     cmd: "$(location gen_constants.sh) $(in) $(out)",
     srcs: [":libminijail_gen_constants_obj"],
     out: ["libconstants.c"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_library_static {
@@ -115,6 +135,11 @@
             ],
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 cc_object {
@@ -191,6 +216,11 @@
             ],
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.adbd",
+        "com.android.media.swcodec",
+    ],
 }
 
 // Example ASan-ified libminijail shared library for target.