diff options
| author | Marcell Kovacs <marcellk@google.com> | 2021-11-18 10:58:53 -0800 |
|---|---|---|
| committer | Marcell Kovacs <marcellk@google.com> | 2021-11-18 12:27:46 -0800 |
| commit | 7f74712d0a0193a5bbd0fe8eb8aeedaf765b2e39 (patch) | |
| tree | a2acbe8198243f6d2ff04a59120d8f79cd22ef7b | |
| parent | 764ee20607a355d33ab87ec5bb04557f258c400b (diff) | |
| download | car-7f74712d0a0193a5bbd0fe8eb8aeedaf765b2e39.tar.gz | |
Exclude btusb seplicies in gsi targets
This should fix the build breakage on gsi targets.
Bug: 202405948
Test: local build
Change-Id: I23a20dfb10e95a1bfb22aaaaa541a4b7586d38f4
| -rw-r--r-- | emulator/bluetooth/btlinux-service.mk | 5 | ||||
| -rw-r--r-- | gsi_car_base.mk | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/emulator/bluetooth/btlinux-service.mk b/emulator/bluetooth/btlinux-service.mk index 90342f2..ab427d2 100644 --- a/emulator/bluetooth/btlinux-service.mk +++ b/emulator/bluetooth/btlinux-service.mk @@ -19,8 +19,11 @@ PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.1-service.btlinux \ +# Allow sepolicies to be excluded in GSI targets. +ifeq ($(DO_NOT_INCLUDE_BT_SEPOLICY),) BOARD_SEPOLICY_DIRS += \ - device/generic/car/emulator/bluetooth/sepolicy \ + device/generic/car/emulator/bluetooth/sepolicy +endif PRODUCT_COPY_FILES += \ device/generic/car/emulator/bluetooth/vendor.qemu.preferred.bt.service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qemu.preferred.bt.service.rc \ diff --git a/gsi_car_base.mk b/gsi_car_base.mk index 67b8ac9..406c621 100644 --- a/gsi_car_base.mk +++ b/gsi_car_base.mk @@ -164,5 +164,6 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += %.odex %.vdex %.art PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay EMULATOR_VENDOR_NO_SENSORS := true PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true +DO_NOT_INCLUDE_BT_SEPOLICY := true $(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) EMULATOR_VENDOR_NO_SOUND := true |