Embed libbt-protos-lite into libbt-common

libbt-common and its test are the only users.

Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: I19021aa51fa3cc6be78bcc262014c8c0b06c35ba

12 files changed, 11 insertions, 51 deletions

diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 8a3cd65a37..101e9df5b9 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -237,7 +237,6 @@ cc_test {
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
-        "libbt-protos-lite",
         "libbtcore",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
@@ -283,7 +282,6 @@ cc_test {
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
-        "libbt-protos-lite",
         "libbtcore",
         "libchrome",
         "libosi",
@@ -398,7 +396,6 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbt-common",
-        "libbt-protos-lite",
         "libbtcore",
         "libbtdevice",
         "libchrome",
@@ -460,7 +457,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
@@ -504,7 +500,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
@@ -559,7 +554,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
@@ -723,7 +717,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
@@ -795,7 +788,6 @@ cc_test {
         "crypto_toolbox_for_tests",
         "libbt-audio-hal-interface",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
@@ -858,7 +850,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
@@ -911,7 +902,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "liblc3",
@@ -975,7 +965,6 @@ cc_test {
     static_libs: [
         "libbt-audio-hal-interface",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -1036,7 +1025,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
     ],
@@ -1098,7 +1086,6 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
         "libevent",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 08df424495..dc0bc2a999 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -286,7 +286,6 @@ cc_test {
         "libbt-bta-core",
         "libbt-common",
         "libbt-hci",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
@@ -413,7 +412,6 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libosi-AllocationTestHarness",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 95b20a2ec7..1fe413dfff 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -71,7 +71,6 @@ cc_defaults {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libcutils",
         "libgmock",
         "libosi",
@@ -95,7 +94,6 @@ cc_defaults {
         "com.android.btservices",
     ],
     static_libs: [
-        "libbt-protos-lite",
         "libflatbuffers-cpp",
         "libprotobuf-cpp-lite",
     ],
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 3c6a803dca..e43791b88d 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -28,9 +28,17 @@ cc_library_static {
         "stop_watch_legacy.cc",
         "time_util.cc",
     ],
+    proto: {
+        type: "lite",
+        canonical_path_from_root: false,
+        export_proto_headers: true,
+    },
     target: {
         android: {
-            srcs: ["metrics.cc"],
+            srcs: [
+                ":bluetooth-metrics-proto",
+                "metrics.cc",
+            ],
         },
         host: {
             srcs: ["metrics_linux.cc"],
@@ -85,7 +93,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
diff --git a/system/gd/proto/Android.bp b/system/gd/proto/Android.bp
index 55a66764e5..6136cf84f6 100644
--- a/system/gd/proto/Android.bp
+++ b/system/gd/proto/Android.bp
@@ -23,20 +23,11 @@ java_library_static {
     sdk_version: "current",
 }
 
-cc_library_static {
-    name: "libbt-protos-lite",
-    host_supported: true,
-    proto: {
-        export_proto_headers: true,
-        type: "lite",
-    },
+filegroup {
+    name: "bluetooth-metrics-proto",
     srcs: [
         "bluetooth/metrics/bluetooth.proto",
     ],
-    apex_available: [
-        "com.android.btservices",
-    ],
-    min_sdk_version: "30",
 }
 
 cc_library_static {
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index b18b4eb9c7..37d71e7cc2 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -52,7 +52,6 @@ rust_defaults {
         "libbt-bta-core",
         "libbt-common",
         "libbt-hci",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index d84e98b03e..a85b387184 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -203,7 +203,6 @@ cc_test {
     static_libs: [
         "libbluetooth-dumpsys",
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index da4f9cf2e1..b20d4ac63c 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -160,7 +160,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libc++fs",
         "libchrome",
         "libevent",
diff --git a/system/osi/test/fuzzers/alarm/Android.bp b/system/osi/test/fuzzers/alarm/Android.bp
index 4bcef92af9..4e09043cce 100644
--- a/system/osi/test/fuzzers/alarm/Android.bp
+++ b/system/osi/test/fuzzers/alarm/Android.bp
@@ -23,7 +23,6 @@ cc_fuzz {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 97619c7269..804c81b4c4 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -660,7 +660,6 @@ cc_test {
         "libbt-bta-core",
         "libbt-common",
         "libbt-hci",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
@@ -739,7 +738,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
@@ -932,7 +930,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -997,7 +994,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "liblog",
@@ -1104,7 +1100,6 @@ cc_test {
     static_libs: [
         "libFraunhoferAAC",
         "libbt-common",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libchrome",
@@ -1156,7 +1151,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "liblog",
         "libosi",
@@ -1212,7 +1206,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -1319,7 +1312,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -1432,7 +1424,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbtdevice",
@@ -1486,7 +1477,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libbte",
         "libchrome",
@@ -1542,7 +1532,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libbte",
         "libchrome",
@@ -1614,7 +1603,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1696,7 +1684,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1778,7 +1765,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1864,7 +1850,6 @@ cc_test {
     ],
     static_libs: [
         "libbt-common",
-        "libbt-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 822bc50312..d187b961ed 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -29,7 +29,6 @@ cc_defaults {
         "libbt-bta-core",
         "libbt-common",
         "libbt-hci",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index aad71a9995..e1f667cc34 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -92,7 +92,6 @@ cc_binary {
         "libbt-bta-core",
         "libbt-common",
         "libbt-hci",
-        "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",