commit 7280acc99663f36e7e2eb7df0586e84073de2051
author Tri Vo <trong@google.com> Tue Feb 23 20:35:01 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 23 20:35:01 2021 +0000
tree 1feded9dc80a475cf07bfc148bc72f0488817c59
parent 40839a84697ac15a298b40c7dc4c22b105519ffd
parent cb89889af3b9d6434dc62681ff0a0a9017b1e170

Merge "trusty: fuzz: Link to libtrusty dynamically"

trusty/coverage/Android.bp

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",
     ],
 }
 

trusty/fuzz/Android.bp

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",
     ],
 }