Revert^2 "Avoid libtistress static link to art"
This reverts commit a2a1b55064508547e6a9ce39654f9ddc434b4e32.
Reason for revert: The original CL should not have been
reverted, it was not the reason for BuildBot breakage.
Bug: 147727942
Change-Id: I2e82b3cfbf0cd05528e654a24319eed93859ba7c
diff --git a/test/Android.bp b/test/Android.bp
index 3c10d1e..de3f516 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -484,15 +484,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 {
@@ -501,31 +504,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 {