oriole/raven: add etm modules in userdebug/eng builds

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

Bug: 364309766
Bug: 340617717
Bug: 331725877
Test: build and run oriole-trunk_staging-userdebug
Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG
Change-Id: Iea66467b22086066972b214ba7af553158f80b03
This commit is contained in:
Yabin Cui 2024-05-23 15:14:23 -07:00
parent 6fd62fe96e
commit e0fcb2d3ba
4 changed files with 26 additions and 0 deletions

View file

@ -347,3 +347,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20486
# 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

@ -357,3 +357,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20487
# 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

@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/oriole-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.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

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