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

Commit 1b82bb26 authored Jan 21, 2021 by Joel Galenson

Explicitly add static dependencies

Soong does not propagate dependencies through static targets, which
can cause linker errors.  Until this is fixed, add the dependencies
explicitly.

Test: Build with and without coverage locally
Test: Will run TreeHugger and Forrest
Change-Id: Icab6568f3cc0783bf2a550ecd15b08f57c0d77b2

parent 9b0e46bd

system/build/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,11 @@ fluoride_defaults {
		fluoride_defaults {
		name: "fluoride_defaults",
		defaults: ["fluoride_defaults_fuzzable", "fluoride_types_defaults"],
		shared_libs: ["libstatslog"],
		shared_libs: [
		"libgrpc++",
		"libgrpc_wrap",
		"libstatslog"
		],
		sanitize: {
		misc_undefined: ["bounds"],
		},

system/gd/Android.bp

+38 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,8 @@ cc_defaults {
		"libchrome",
		"libcrypto",
		"libflatbuffers-cpp",
		"libgrpc++",
		"libgrpc_wrap",
		],
		static_libs: [
		"libbluetooth-protos",
		@@ -237,7 +239,9 @@ cc_binary {
		"libbacktrace",
		"libchrome",
		"libcrypto",
		"libgrpc++",
		"libgrpc++_unsecure",
		"libgrpc_wrap",
		"libprotobuf-cpp-full",
		],
		target: {
		@@ -248,6 +252,10 @@ cc_binary {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		host: {
		required: [
		@@ -295,6 +303,10 @@ cc_test {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		srcs: [
		@@ -335,6 +347,8 @@ cc_test {
		shared_libs: [
		"libchrome",
		"libcrypto",
		"libgrpc++",
		"libgrpc_wrap",
		],
		sanitize: {
		address: true,
		@@ -370,6 +384,24 @@ cc_test {
		"libcxxbridge05",
		"libchrome",
		],
		shared_libs: [
		"libgrpc++",
		"libgrpc_wrap",
		],
		target: {
		android: {
		shared_libs: [
		"android.hardware.bluetooth@1.0",
		"libhidlbase",
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		}

		cc_defaults {
		@@ -397,6 +429,8 @@ cc_defaults {
		shared_libs: [
		"libcrypto",
		"libflatbuffers-cpp",
		"libgrpc++",
		"libgrpc_wrap",
		],
		cflags: [
		"-DFUZZ_TARGET",
		@@ -409,6 +443,10 @@ cc_defaults {
		"libhidlbase",
		"libutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		}