Merge "BUILD: Disable build for mac-host target" (ef375faf) · Commits · e / os / android_packages_modules_Bluetooth

system/btcore/Android.bp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -18,9 +18,6 @@ cc_library_static {
	header_libs: ["libbluetooth_headers"],		header_libs: ["libbluetooth_headers"],
	host_supported: true,		host_supported: true,
	target: {		target: {
	darwin: {
	enabled: false,
	},
	linux_glibc: {		linux_glibc: {
	cflags: ["-D_GNU_SOURCE"],		cflags: ["-D_GNU_SOURCE"],
	},		},
	@@ -50,9 +47,4 @@ cc_test {
	"libosi",		"libosi",
	],		],
	host_supported: true,		host_supported: true,
	target: {
	darwin: {
	enabled: false,
	}
	}
	}		}

+0 −5

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,12 @@ fluoride_defaults {
	],		],
	},		},
	},		},
	shared_libs: [ "libchrome" ]		shared_libs: [ "libchrome" ],
	// Setup Bluetooth local make variables for handling configuration		target: {
			darwin: {
			enabled: false,
			},
			},
	}		}

	fluoride_defaults {		fluoride_defaults {

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -22,11 +22,6 @@ cc_test_library {
	shared: {		shared: {
	enabled: false		enabled: false
	},		},
	target: {
	darwin: {
	enabled: false
	}
	}
	}		}

	cc_test_library {		cc_test_library {
	@@ -39,11 +34,6 @@ cc_test_library {
	shared: {		shared: {
	enabled: false		enabled: false
	},		},
	target: {
	darwin: {
	enabled: false
	}
	}
	}		}

	// Bluetooth Protobuf static library for target and host		// Bluetooth Protobuf static library for target and host
	@@ -56,11 +46,6 @@ cc_library_static {
	export_proto_headers: true,		export_proto_headers: true,
	},		},
	host_supported: true,		host_supported: true,
	target: {
	darwin: {
	enabled: false
	}
	}
	}		}


	@@ -106,9 +91,6 @@ cc_library_static {
	// should be compatible for a Linux host OS. We should figure out what to do for		// should be compatible for a Linux host OS. We should figure out what to do for
	// a non-Linux host OS.		// a non-Linux host OS.
	target: {		target: {
	darwin: {
	enabled: false,
	},
	linux_glibc: {		linux_glibc: {
	cflags: [		cflags: [
	"-D_GNU_SOURCE",		"-D_GNU_SOURCE",
	@@ -162,9 +144,6 @@ cc_test {
	linux_glibc: {		linux_glibc: {
	cflags: ["-DOS_GENERIC"],		cflags: ["-DOS_GENERIC"],
	},		},
	darwin: {
	enabled: false,
	}
	},		},
	sanitize: {		sanitize: {
	cfi: false,		cfi: false,

+0 −5