diff options
author | Xin Li <delphij@google.com> | 2022-06-14 16:39:44 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-06-14 16:39:44 -0700 |
commit | 0dd139b130fa8ebd11e4727dfd140588fc1c5b7b (patch) | |
tree | c8b2cfd24c1afd5c5ce407fea09276c2d09ec910 /emulator_car_x86_64 | |
parent | bfcee185bfba01d772cb21765a9e27634cfb85d2 (diff) | |
parent | a24498718ccbfd10a4fc43a1ba9a2ecb2d8523b8 (diff) | |
download | car-0dd139b130fa8ebd11e4727dfd140588fc1c5b7b.tar.gz |
Merge Android 12 QPR 3
Bug: 236045730
Merged-In: If61a479068bf9475b36885e3dcce778dfeb0b6e3
Change-Id: I8532fa760096167baa0ccb23938025c8d3e78989
Diffstat (limited to 'emulator_car_x86_64')
-rw-r--r-- | emulator_car_x86_64/BoardConfig.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/emulator_car_x86_64/BoardConfig.mk b/emulator_car_x86_64/BoardConfig.mk index 999f93b..1d99680 100644 --- a/emulator_car_x86_64/BoardConfig.mk +++ b/emulator_car_x86_64/BoardConfig.mk @@ -15,11 +15,10 @@ # Use generic_x86_64 BoardConfig as base include build/make/target/board/emulator_x86_64/BoardConfig.mk +include device/generic/car/emulator/usbpt/BoardConfig.mk # Override BOARD_SUPER_PARTITION_SIZE to inclease the mounted system partition. BOARD_SUPER_PARTITION_SIZE := 5856296960 BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE = 3489660928 -BOARD_HAVE_BLUETOOTH := true -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/car/emulator/bluetooth/hal |