diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-12-14 02:33:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-12-14 02:33:15 +0000 |
| commit | 9de0cb59f371c77166d2f9c292e12a9b4d8a76fc (patch) | |
| tree | eec5abe9a36bdf42bc65d0640dbf5c7a03c38b40 | |
| parent | a17a944d164c3562117f681347e0d361bcaa5cd8 (diff) | |
| parent | 479837b03604678ca08a324e8d4507d773ddde48 (diff) | |
| download | build-android10-gsi.tar.gz | |
Merge "Disable BLE_VND_INCLUDED in GSI" into android10-gsiandroid10-gsi
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 702ef3c669..2d5a59c4e1 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -38,6 +38,10 @@ BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 +# TODO(b/123695868, b/146149698): +# This flag is set by mainline but isn't desired for GSI +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := + # GSI specific System Properties ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop |