From 401e6d9c7fc753c695f68f8c78f01b711d77f227 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Wed, 20 Feb 2019 16:58:42 +0000
Subject: [PATCH] Fix libdexfile dependencies to avoid direct dependency on
 libdexfile_external.

It should be dlopen'ed lazily by libdexfile_support now.

Test: mmma system/extras/simpleperf
Test: atest simpleperf_unit_test
  (1 failure in cpu_offline test, but that happens even without this CL)
Bug: 124827589
Bug: 123186083
Change-Id: Ibeb37b130f0081965b986622794f60ec75cd2e17
---
 simpleperf/Android.bp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index 536bc9a0..096f7bf0 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -99,8 +99,7 @@ cc_defaults {
     name: "libsimpleperf_dex_read_static_reqs_defaults",
     defaults: ["libdexfile_static_defaults"],
     static_libs: [
-        "libdexfile_external",
-        "libdexfile_support",
+        "libdexfile_support_static",
     ],
     header_libs: ["libdexfile_external_headers"],
     export_header_lib_headers: ["libdexfile_external_headers"],
@@ -165,9 +164,7 @@ cc_defaults {
         linux: {
             static_libs: [
                 "libunwindstack",
-                "libdexfile_support",
-                "libdexfile_external",
-                "libdexfile",
+                "libdexfile_support_static",
                 "libcutils",
                 "libprocinfo",
                 "libevent",
@@ -209,7 +206,6 @@ cc_defaults {
         linux: {
             shared_libs: [
                 "libcutils",
-                "libdexfile_external",
                 "libdexfile_support",
                 "libevent",
                 "libprocinfo",
-- 
2.11.0