Snap for 10016910 from e74cb65e0c5d2580ec0941e142f3096d8617f113 to emu-33-release

Change-Id: I492b876ff7d0d0eb755321b8bd49b759e8f7be2f

1 files changed, 6 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 4c40b571..59e55618 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,10 +58,8 @@ rust_library {
     vendor_available: true,
     product_available: true,
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.btservices",
-        "com.android.compos",
-        "com.android.virt",
     ],
     min_sdk_version: "29",
 }
@@ -75,10 +73,8 @@ cc_library_static {
     vendor_available: true,
     product_available: true,
     apex_available: [
+        "//apex_available:anyapex",
         "//apex_available:platform",
-        "com.android.btservices",
-        "com.android.compos",
-        "com.android.virt",
     ],
     min_sdk_version: "29",
 }
@@ -87,7 +83,10 @@ cc_library_static {
     host_supported: true,
     name: "libcxx-demo-blobstore",
     srcs: ["demo/src/blobstore.cc"],
-    generated_headers: ["cxx-demo-bridge-header", "cxx-bridge-header"],
+    generated_headers: [
+        "cxx-demo-bridge-header",
+        "cxx-bridge-header",
+    ],
     generated_sources: ["cxx-demo-bridge-code"],
 }