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

Commit 34779433 authored Nov 10, 2022 by Hui Peng Committed by Automerger Merge Worker Nov 10, 2022

Merge "Add support for address hiding [3/3]" am: 92e82adc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2275238

Change-Id: I0f3ecd76168bb8a1e7193c68158a69e222a03dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2311f55b 92e82adc

system/BUILD.gn

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ config("target_defaults") {
		"//bt/system/linux_include",
		"//bt/system/types",
		"//bt/system/include",
		"//bt/system/gd",

		# For flatbuffer generated headers
		"${root_gen_dir}/bt/system/gd/",

system/btif/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,9 @@ cc_defaults {
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		local_include_dirs: [
		"include"
		],
		target: {
		android: {
		whole_static_libs: [

system/build/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@ cc_defaults {
		// there are too many unused parameters in all the code.
		"-Wno-unused-parameter",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system/gd",
		],
		}

		fluoride_defaults {

system/gd/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ cc_defaults {
		":BluetoothSecuritySources",
		":BluetoothStorageSources",
		":BluetoothSyspropsSources",
		":BluetoothLogRedactionSources",
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",

system/gd/os/Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,13 @@ name: "BluetoothOsBenchmarkSources",
		],
		}

		filegroup {
		name: "BluetoothLogRedactionSources",
		srcs: [
		"logging/log_redaction.cc",
		],
		}

		filegroup {
		name: "BluetoothOsSources_fake_timer",
		srcs: [