commit ee7aa0906c8d8fe09c103f02ff3a085e00666c92
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 26 09:18:51 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 26 09:18:51 2021 +0000
tree 33243a571d78d7d859690a2f155d64b3c6d3c4ec
parent af5fb31f1cfcb5c28684d4e263d248824b543630
parent 33157a2da8e366a6fb1fcf684795a2bb01409695

Merge "Disable BLE_VND_INCLUDED in GSI"

target/board/BoardConfigGsiCommon.mk

diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk
index e34dc23..a2150ad 100644
--- a/target/board/BoardConfigGsiCommon.mk
+++ b/target/board/BoardConfigGsiCommon.mk
@@ -49,6 +49,10 @@
 BOARD_GSI_DYNAMIC_PARTITIONS_SIZE := 3221225472
 endif
 
+# TODO(b/123695868, b/146149698):
+#     This flag is set by mainline but isn't desired for GSI
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR :=
+
 # Enable chain partition for boot, mainly for GKI images.
 BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048