Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb89889a authored Feb 19, 2021 by Tri Vo

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

parent 2c41c142

trusty/coverage/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -25,14 +25,11 @@ cc_library {
		export_include_dirs: [
		"include",
		],
		static_libs: [
		"libtrusty",
		],

		shared_libs: [
		"libbase",
		"liblog",
		"libdmabufheap",
		"libtrusty",
		],
		}

trusty/fuzz/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package {
		cc_defaults {
		name: "trusty_fuzzer_defaults",
		shared_libs: [
		"libtrusty",
		"libtrusty_coverage",
		"libtrusty_fuzz_utils",
		"libbase",
		@@ -43,11 +44,11 @@ cc_library {
		export_include_dirs: ["include"],
		static_libs: [
		"libFuzzer",
		"libtrusty",
		],
		shared_libs: [
		"libtrusty_coverage",
		"libbase",
		"liblog",
		"libtrusty",
		],
		}