commit 2d7ce417966c09072ef67642dd1b5bb2c4ab2c3d
author Kelvin Zhang <zhangkelvin@google.com> Tue Aug 01 07:00:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 01 07:00:29 2023 +0000
tree 9f48145d15eea59bb6325a590196ce18a2eefad1
parent 37a5342b1e4749a78c7d629292cd05ce66de1fce
parent 8c76a819f9c196fda05b81b20b02a6280c08173c

Merge "Make libdebuggerd ramdisk available." into main am: dccb1e904d am: 8e6a2c8fab am: 8c76a819f9

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

Change-Id: I6ea99ec19d7569f0371fb5c7dff6ed60532b09ec
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 d20de6b..5393e25 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -188,6 +188,7 @@
 cc_library_static {
     name: "libdebuggerd",
     defaults: ["debuggerd_defaults"],
+    ramdisk_available: true,
     recovery_available: true,
     vendor_ramdisk_available: true,
 
@@ -221,9 +222,6 @@
         "libbase",
         "libcutils",
     ],
-    runtime_libs: [
-        "libdexfile",           // libdexfile_support dependency
-    ],
 
     whole_static_libs: [
         "libasync_safe",
@@ -250,6 +248,19 @@
                 "libdexfile",
             ],
         },
+        ramdisk: {
+            exclude_static_libs: [
+                "libdexfile_support",
+            ],
+            exclude_runtime_libs: [
+                "libdexfile",
+            ],
+        },
+        android: {
+            runtime_libs: [
+                "libdexfile",           // libdexfile_support dependency
+            ],
+        },
     },
 
     product_variables: {

debuggerd/proto/Android.bp

diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp
index 73cf573..804f805 100644
--- a/debuggerd/proto/Android.bp
+++ b/debuggerd/proto/Android.bp
@@ -35,6 +35,7 @@
         "com.android.runtime",
     ],
 
+    ramdisk_available: true,
     recovery_available: true,
     vendor_ramdisk_available: true,
 }