cheetah/panther: add etm modules in userdebug/eng builds

If etm modules aren't built with kernel prebuilts, then
add them manually.

Bug: 364755673
Bug: 364309766
Test: build cheetah-trunk_staging-userdebug
Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG
Change-Id: I5b5ce51ca59c912f5ebbac66b6ade5adc90ec7f5
This commit is contained in:
Yabin Cui 2024-09-04 21:08:48 -07:00 committed by Treehugger Robot
parent 8962fe3676
commit ed46d4d345
4 changed files with 26 additions and 0 deletions

View file

@ -33,3 +33,9 @@ include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
include device/google/pantah-sepolicy/cheetah-sepolicy.mk
include device/google/pantah/wifi/BoardConfig-wifi.mk
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/BoardUserdebugModules.mk
endif
endif

View file

@ -468,3 +468,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20490
# ETM
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
endif

View file

@ -451,3 +451,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20489
# ETM
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif
endif

View file

@ -38,3 +38,9 @@ include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk
include device/google/pantah-sepolicy/panther-sepolicy.mk
include device/google/pantah/wifi/BoardConfig-wifi.mk
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/BoardUserdebugModules.mk
endif
endif