Merge "Simpleperf: Use defaults to pass static libs"

3 files changed, 18 insertions, 13 deletions

diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp
index 31f5806e..61da0f50 100644
--- a/perfprofd/Android.bp
+++ b/perfprofd/Android.bp
@@ -213,6 +213,7 @@ cc_binary {
     name: "perfprofd",
     defaults: [
         "perfprofd_defaults",
+        "libsimpleperf_elf_read_static_reqs_defaults",
     ],
 
     srcs: [
diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp
index b562cf03..215f9fc3 100644
--- a/perfprofd/tests/Android.bp
+++ b/perfprofd/tests/Android.bp
@@ -19,6 +19,7 @@ cc_test {
     name: "perfprofd_test",
     defaults: [
         "perfprofd_test_defaults",
+        "libsimpleperf_elf_read_static_reqs_defaults",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp
index bf967457..dc98a269 100644
--- a/simpleperf/Android.bp
+++ b/simpleperf/Android.bp
@@ -41,10 +41,26 @@ cc_defaults {
     ],
 }
 
+cc_defaults {
+    name: "libsimpleperf_elf_read_static_reqs_defaults",
+    static_libs: [
+        "libLLVMObject",
+        "libLLVMBitReader",
+        "libLLVMMC",
+        "libLLVMMCParser",
+        "libLLVMCore",
+        "libLLVMSupport",
+        "liblzma",
+        "libz",
+        "libziparchive",
+    ],
+}
+
 cc_library_static {
     name: "libsimpleperf_elf_read",
     defaults: [
         "simpleperf_defaults",
+        "libsimpleperf_elf_read_static_reqs_defaults",
     ],
     host_supported: true,
 
@@ -60,19 +76,6 @@ cc_library_static {
     static_libs: [
         "libbase",
     ],
-    // Use whole-static to avoid having to pull this in later.
-    whole_static_libs: [
-        "libLLVMObject",
-        "libLLVMBitReader",
-        "libLLVMMC",
-        "libLLVMMCParser",
-        "libLLVMCore",
-        "libLLVMSupport",
-        "liblog",
-        "liblzma",
-        "libz",
-        "libziparchive",
-    ],
 
     target: {
         // Required for LLVM.