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

Commit c602562b authored Dec 17, 2020 by Stephen Crane Committed by Tri Vo Dec 22, 2020

trusty: Add vendor variant of libtrusty_coverage

We want to add coverage statistics to the trusty-ut-ctrl tool, which is
a vendor binary. Thus we need a vendor variant of libtrusty_coverage.
Merges system libtrusty_test and vendor libtrusty into a single
vendor_available library so that we can add vendor_available to
libtrusty_coverage and make it accessible from vendor tools.

Bug: 175221942
Test: make libtrusty_coverage
Change-Id: I68cc8f1c1580bda8591dbe744e9751474811576d

parent bc053268

trusty/coverage/Android.bp

+4 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		cc_library {
		name: "libtrusty_coverage",
		vendor_available: true,
		srcs: [
		"coverage.cpp",
		],
		@@ -21,8 +22,9 @@ cc_library {
		"include",
		],
		static_libs: [
		"libtrusty_test",
		"libtrusty",
		],

		shared_libs: [
		"libbase",
		"liblog",
		@@ -36,7 +38,7 @@ cc_test {
		],
		static_libs: [
		"libtrusty_coverage",
		"libtrusty_test",
		"libtrusty",
		],
		shared_libs: [
		"libbase",

trusty/fuzz/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ cc_library {
		export_include_dirs: ["include"],
		static_libs: [
		"libFuzzer",
		"libtrusty_test",
		"libtrusty",
		],
		shared_libs: [
		"libtrusty_coverage",

trusty/libtrusty/Android.bp

+3 −8

Original line number	Diff line number	Diff line
		@@ -26,13 +26,8 @@ cc_defaults {

		cc_library {
		name: "libtrusty",
		vendor: true,
		defaults: ["libtrusty_defaults"],
		}

		// TODO(b/170753563): cc_fuzz can't deal with vendor components. Build libtrusty
		// for system.
		cc_test_library {
		name: "libtrusty_test",
		// TODO(b/170753563): cc_fuzz can't deal with vendor components. Build
		// libtrusty for system and vendor.
		vendor_available: true,
		defaults: ["libtrusty_defaults"],
		}