From 33157a2da8e366a6fb1fcf684795a2bb01409695 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Thu, 13 Aug 2020 15:36:29 +0800 Subject: [PATCH] Disable BLE_VND_INCLUDED in GSI Not all devices support BLE_VND_INCLUDED. Disable BLE_VND_INCLUDED in GSI before it becoming a runtime enabled feature. Bug: 146149698 Bug: 160930886 Test: build aosp_arm64-userdebug, check the feature manually Change-Id: I17fd2c1c3cdb87fde11362683d4a7bec1d989b6f --- target/board/BoardConfigGsiCommon.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 9d55f42af..8d80c9bc2 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -47,6 +47,10 @@ BOARD_GSI_DYNAMIC_PARTITIONS_PARTITION_LIST := system 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