From 39c3961887a0e98c7731037426e6cadf0a2705fd Mon Sep 17 00:00:00 2001
From: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Date: Tue, 2 Mar 2021 22:33:33 +0000
Subject: [PATCH] Change libbt-platform-protos dependency
Move the dependency to use the target included in
//external/proto_logging instead. This will be provided via cros_workon
for ChromeOS and in the prepared platform-dir for Linux build.
Bug: 176847256
Tag: #floss
Test: atest --host bluetooth_test_gd
Change-Id: I86da8ca8e7b666ccdc4cc36680f90083bbe76dfb
---
BUILD.gn | 6 ++++++
system/btif/BUILD.gn | 2 +-
system/common/BUILD.gn | 2 +-
system/stack/BUILD.gn | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index 88a7616a7cb..109bf7167ce 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -128,6 +128,12 @@ config("target_defaults") {
configs = [ ":external_libchrome" ]
}
+group("libbt-platform-protos-lite") {
+ deps = [
+ "//external/proto_logging/stats/enums/bluetooth:libbt-platform-protos-lite",
+ ]
+}
+
# Configurations to use as dependencies for GN build
config("external_gtest") {
configs = [
diff --git a/system/btif/BUILD.gn b/system/btif/BUILD.gn
index d29e7449bea..f2c5436abd0 100644
--- a/system/btif/BUILD.gn
+++ b/system/btif/BUILD.gn
@@ -114,10 +114,10 @@ static_library("btif") {
]
deps = [
+ "//bt:libbt-platform-protos-lite",
"//bt/common",
"//bt/gd/rust/shim:init_flags_bridge_header",
"//bt/profile/avrcp:profile_avrcp",
- "//bt/third_party/proto_logging/stats:libbt-platform-protos",
]
configs += [
diff --git a/system/common/BUILD.gn b/system/common/BUILD.gn
index 94614e89124..0260fb21237 100644
--- a/system/common/BUILD.gn
+++ b/system/common/BUILD.gn
@@ -34,8 +34,8 @@ static_library("common") {
]
deps = [
+ "//bt:libbt-platform-protos-lite",
"//bt/gd/rust/shim:init_flags_bridge_header",
- "//bt/third_party/proto_logging/stats:libbt-platform-protos",
]
configs += [ "//bt:target_defaults" ]
diff --git a/system/stack/BUILD.gn b/system/stack/BUILD.gn
index 2eae0d89aee..5406dbd5b52 100644
--- a/system/stack/BUILD.gn
+++ b/system/stack/BUILD.gn
@@ -220,8 +220,8 @@ source_set("stack") {
deps = [
":crypto_toolbox",
":nonstandard_codecs",
+ "//bt:libbt-platform-protos-lite",
"//bt/gd/rust/shim:init_flags_bridge_header",
- "//bt/third_party/proto_logging/stats:libbt-platform-protos",
"//bt/types",
"//bt/types",
]
--
GitLab