commit 5875cf416c218f48bf93d3c3b19db5cacd2a322f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 07 13:53:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 07 13:53:10 2022 +0000
tree 4e2df5093f015ee581785eb0e41d4cb18559e50d
parent 8f9a356bd18cbba4422e806b5c2151a580f2b249
parent c5b7488c63101ab9dee6caaced43d35155ca5e00

Merge "Make some debuggerd libraries available in apex com.android.virt" am: c5b7488c63

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2054410

Change-Id: I6d58bc9addcf17906e8a1a42c66c412d4a57bf3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

debuggerd/Android.bp

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index e0c138b..ad0231d 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -24,6 +24,10 @@
     export_include_dirs: ["common/include"],
     recovery_available: true,
     vendor_ramdisk_available: true,
+    apex_available: [
+        "com.android.virt",
+        "//apex_available:platform",
+   ],
 }
 
 cc_library_shared {
@@ -44,6 +48,10 @@
         "libbase",
         "libcutils",
     ],
+    apex_available: [
+        "com.android.virt",
+        "//apex_available:platform",
+    ],
 
     export_header_lib_headers: ["libdebuggerd_common_headers"],
     export_include_dirs: ["tombstoned/include"],

debuggerd/rust/tombstoned_client/Android.bp

diff --git a/debuggerd/rust/tombstoned_client/Android.bp b/debuggerd/rust/tombstoned_client/Android.bp
index 981f8a4..2007f39 100644
--- a/debuggerd/rust/tombstoned_client/Android.bp
+++ b/debuggerd/rust/tombstoned_client/Android.bp
@@ -17,6 +17,7 @@
     shared_libs: [
         "libtombstoned_client",
     ],
+    apex_available: ["com.android.virt"],
 }
 
 rust_defaults {