From 3784b9de463181f7fcadb5cd836423357095d42e Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Thu, 26 Aug 2021 21:18:43 +0100
Subject: [PATCH] Add libdexfile runtime dependency of libdexfile_support
 (reland).

Necessary since static_libs doesn't propagate transitive dependencies
in Soong.

Test: m droid
Bug: 197856821
Bug: 169779783
Change-Id: Ia70f8596228770451c95610be0e97783dabf3af3
---
 debuggerd/Android.bp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index f713ff2df..9ca0eba6e 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -210,6 +210,9 @@ cc_library_static {
         "libcutils",
         "liblog",
     ],
+    runtime_libs: [
+        "libdexfile",           // libdexfile_support dependency
+    ],
 
     whole_static_libs: [
         "libasync_safe",
@@ -225,11 +228,17 @@ cc_library_static {
             exclude_static_libs: [
                 "libdexfile_support",
             ],
+            exclude_runtime_libs: [
+                "libdexfile",
+            ],
         },
         vendor_ramdisk: {
             exclude_static_libs: [
                 "libdexfile_support",
             ],
+            exclude_runtime_libs: [
+                "libdexfile",
+            ],
         },
     },