commit 7ef64b191b546c607f510699f98f99d3b2995002
author Nicolas Geoffray <ngeoffray@google.com> Tue Jan 11 18:43:40 2022 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 12 13:45:19 2022 +0000
tree 1f3e0708ba49970da3f6bfdcc60a20fe9f0d3f36
parent c7ea9b14b9d9d85912d9c4800646be6996de60f2

Fix perfetto debug library.

It should always use the -d versions of its dependencies.

Test: boot with the debug apex.
Bug: 214049018
Change-Id: Icc2bc4985279c178fae315e5a501c040446c0c9c

perfetto_hprof/Android.bp

diff --git a/perfetto_hprof/Android.bp b/perfetto_hprof/Android.bp
index b2c9dad..a81a4fa 100644
--- a/perfetto_hprof/Android.bp
+++ b/perfetto_hprof/Android.bp
@@ -52,7 +52,6 @@
     shared_libs: [
         "libbase",
         "liblog",
-        "libdexfile",
     ],
     static_libs: [
         "libperfetto_client_experimental",
@@ -77,6 +76,7 @@
     shared_libs: [
         "libart",
         "libartbase",
+        "libdexfile",
     ],
     apex_available: [
         "com.android.art",
@@ -93,6 +93,7 @@
     shared_libs: [
         "libartd",
         "libartbased",
+        "libdexfiled",
     ],
     apex_available: [
         "com.android.art.debug",