Merge "Use ubsan on device target only" (543402eb) · Commits · e / os / android_packages_modules_Bluetooth

system/build/Android.bp

+6 −6

Original line number	Diff line number	Diff line
		@@ -76,6 +76,9 @@ fluoride_defaults {
		target: {
		android: {
		test_config_template: ":BluetoothTestConfigTemplate",
		sanitize: {
		misc_undefined: ["bounds"],
		},
		},
		},
		defaults: ["fluoride_types_defaults_fuzzable"],
		@@ -94,9 +97,6 @@ fluoride_defaults {
		"libcutils",
		],
		cpp_std: "c++17",
		sanitize: {
		misc_undefined: ["bounds"],
		},
		}

		fluoride_defaults {
		@@ -111,9 +111,6 @@ fluoride_defaults {
		"libutils",

		],
		sanitize: {
		misc_undefined: ["bounds"],
		},
		static_libs: [
		"libbluetooth_gd",
		"libbluetooth_rust_interop",
		@@ -132,6 +129,9 @@ fluoride_defaults {
		cflags: [
		"-DOS_ANDROID",
		],
		sanitize: {
		misc_undefined: ["bounds"],
		},
		},
		},
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ cc_defaults {
		shared_libs: [
		"liblog",
		],
		sanitize: {
		misc_undefined: ["bounds"],
		},
		},
		host: {
		cflags: [
		@@ -43,9 +46,7 @@ cc_defaults {
		"-std=c99",
		],
		header_libs: ["jni_headers"],
		sanitize: {
		misc_undefined: ["bounds"],
		},

		}

		// Enables code coverage for a set of source files. Must be combined with