Merge "Merge fluoride_types_defaults_fuzzable into fluoride_defaults" into main (17952641) · Commits · e / os / android_packages_modules_Bluetooth

system/build/Android.bp

+1 −8

Original line number	Diff line number	Diff line
		@@ -7,20 +7,14 @@ package {
		default_applicable_licenses: ["system_bt_license"],
		}

		// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
		// requires no shared libraries, and no explicit sanitization.
		cc_defaults {
		name: "fluoride_types_defaults_fuzzable",
		name: "fluoride_defaults",
		defaults: ["bluetooth_cflags"],
		cflags: [
		"-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
		"-DLOG_NDEBUG=1",
		"-fvisibility=hidden",
		],
		}

		cc_defaults {
		name: "fluoride_defaults",
		target: {
		android: {
		test_config_template: ":BluetoothTestConfigTemplate",
		@@ -29,5 +23,4 @@ cc_defaults {
		},
		},
		},
		defaults: ["fluoride_types_defaults_fuzzable"],
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ cc_library_headers {
		cc_library_static {
		name: "libbluetooth-types",
		vendor_available: true,
		defaults: ["fluoride_types_defaults_fuzzable"],
		defaults: ["fluoride_defaults"],
		cflags: [
		/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
		"-fvisibility=default",