commit d8309caffb3f12663e1780648ab1e4c881471c78
author Mathieu Chartier <mathieuc@google.com> Tue Jan 21 12:27:27 2020 -0800
committer Mathieu Chartier <mathieuc@google.com> Mon Jan 27 16:38:32 2020 +0000
tree bbcf3f99e36743b8dbb61b9eaaed1bad86059dd1
parent 92231c5fd2060fb1290fee99fa483d9461708a53

Avoid libtistress static link to art

Make libtistress use shared linking and add missing libz dependency.

Bug: 147727942
Test: art/test/testrunner/testrunner.py --host -j72 --redefine-stress
Test: mmma art -j72

Change-Id: I3db36dd205555eb0a94d0d56d4277ee2d9b36794

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 89538c6..9e3414c 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -483,15 +483,18 @@
     name: "libtistress-defaults",
     defaults: ["libtistress-srcs"],
     shared_libs: [
-        "libbase",
         "slicer_no_rtti",
+        "libz", // for slicer (using adler32).
     ],
 }
 
 art_cc_test_library {
     name: "libtistress",
     defaults: ["libtistress-defaults"],
-    shared_libs: ["libartbase"],
+    shared_libs: [
+        "libartbase",
+        "libz",
+    ],
 }
 
 art_cc_test_library {
@@ -500,31 +503,38 @@
         "art_debug_defaults",
         "libtistress-defaults",
     ],
-    shared_libs: ["libartbased"],
+    shared_libs: [
+        "libartbased",
+        "libz",
+    ],
 }
 
 art_cc_defaults {
-    name: "libtistress-static-defaults",
+    name: "libtistress-shared-defaults",
     defaults: [
         "libtistress-srcs",
-        "libart_static_defaults",
     ],
     static_libs: ["slicer_no_rtti"],
 }
 
 art_cc_test_library {
     name: "libtistresss",
-    defaults: ["libtistress-static-defaults"],
-    static_libs: ["libartbase"],
+    defaults: ["libtistress-shared-defaults"],
+    shared_libs: [
+        "libartbase",
+        "libz",
+    ],
 }
 
 art_cc_test_library {
     name: "libtistressds",
     defaults: [
-        "art_debug_defaults",
-        "libtistress-static-defaults",
+        "libtistress-shared-defaults",
     ],
-    static_libs: ["libartbased"],
+    shared_libs: [
+        "libartbased",
+        "libz",
+    ],
 }
 
 cc_defaults {