trusty: fuzz: Link to libtrusty dynamically
libtrusty can be depended on by multiple thing in a fuzzer's
dependencies tree. It's no longer convenient to link to statically.
Leave tests statically linked. Test infra doesn't seem to handle shared
test libs correctly.
Bug: 171750250
Test: trusty_test_fuzzer libtrusty_coverage_test
Change-Id: Ic7d003151e43fb5bab63354fd42ea9667332743f
diff --git a/trusty/coverage/Android.bp b/trusty/coverage/Android.bp
index fb30604..c71d599 100644
--- a/trusty/coverage/Android.bp
+++ b/trusty/coverage/Android.bp
@@ -25,14 +25,11 @@
export_include_dirs: [
"include",
],
- static_libs: [
- "libtrusty",
- ],
-
shared_libs: [
"libbase",
"liblog",
"libdmabufheap",
+ "libtrusty",
],
}
diff --git a/trusty/fuzz/Android.bp b/trusty/fuzz/Android.bp
index c8c9fe9..99156f4 100644
--- a/trusty/fuzz/Android.bp
+++ b/trusty/fuzz/Android.bp
@@ -19,6 +19,7 @@
cc_defaults {
name: "trusty_fuzzer_defaults",
shared_libs: [
+ "libtrusty",
"libtrusty_coverage",
"libtrusty_fuzz_utils",
"libbase",
@@ -43,11 +44,11 @@
export_include_dirs: ["include"],
static_libs: [
"libFuzzer",
- "libtrusty",
],
shared_libs: [
"libtrusty_coverage",
"libbase",
"liblog",
+ "libtrusty",
],
}