Merge "rust: Refactor modules for static_lib propagation." (22250328) · Commits · e / os / android_packages_modules_Bluetooth

system/build/Android.bp

+0 −6

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ fluoride_defaults {
		"libbluetooth_rust_interop",
		"liblog",
		"libcutils",
		"libbt_shim_ffi",
		],
		cpp_std: "c++17",
		sanitize: {
		@@ -106,7 +105,6 @@ fluoride_defaults {
		"libbluetooth_gd",
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		target: {
		darwin: {
		@@ -120,10 +118,6 @@ fluoride_defaults {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		}

system/gd/Android.bp

+0 −30

Original line number	Diff line number	Diff line
		@@ -130,10 +130,6 @@ cc_defaults {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		srcs: [
		@@ -169,8 +165,6 @@ cc_defaults {
		static_libs: [
		"libbluetooth-protos",
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		export_static_lib_headers: [ "libbluetooth_rust_interop" ],
		}
		@@ -232,8 +226,6 @@ cc_binary {
		"libbluetooth_gd",
		"libflatbuffers-cpp",
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		shared_libs: [
		"libbacktrace",
		@@ -252,10 +244,6 @@ cc_binary {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		host: {
		required: [
		@@ -303,10 +291,6 @@ cc_test {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		srcs: [
		@@ -341,8 +325,6 @@ cc_test {
		"libflatbuffers-cpp",
		"libgmock",
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		shared_libs: [
		"libchrome",
		@@ -380,8 +362,6 @@ cc_test {
		},
		static_libs: [
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		"libchrome",
		],
		shared_libs: [
		@@ -396,10 +376,6 @@ cc_test {
		"libutils",
		"libcutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		}
		@@ -418,8 +394,6 @@ cc_defaults {
		"libgmock",
		"libgtest",
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		host_supported: true,
		generated_headers: [
		@@ -443,10 +417,6 @@ cc_defaults {
		"libhidlbase",
		"libutils",
		],
		static_libs: [
		"libbt_common_sys_prop_cxx",
		"libbt_hidl_hal_cxx",
		],
		},
		},
		}

system/gd/rust/common/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,4 +70,5 @@ cc_library_static {
		shared_libs: [
		"libcutils",
		],
		whole_static_libs: ["libcxxbridge05"],
		}

system/gd/rust/shim/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ cc_library_static {
		shared_libs: [
		"libchrome",
		],
		static_libs: [
		whole_static_libs: [
		"libbt_shim_ffi",
		],
		}

system/main/Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -114,8 +114,6 @@ cc_library_shared {
		"libudrv-uipc",
		"libbluetooth_gd", // Gabeldorsche
		"libbluetooth_rust_interop",
		"libbt_shim_ffi",
		"libcxxbridge05",
		],
		whole_static_libs: [
		"libbt-bta",