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

Commit 1e086404 authored Jan 22, 2021 by Jeffrey Vander Stoep Committed by Automerger Merge Worker Jan 22, 2021

Merge "Explicitly add static dependencies" am: 96ebc258 am: bbe281f3

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1557291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90092caae2743b29adb58df3501935ef703f6cb3

parents 9448da9d bbe281f3

system/build/Android.bp

+5 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,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",
		],
		},
		},
		}