Merge "comet: add etm modules in userdebug/eng builds" into main

This commit is contained in:
Yabin Cui 2024-03-14 17:41:39 +00:00 committed by Android (Google) Code Review
commit 4c117345c6
2 changed files with 9 additions and 0 deletions

View file

@ -30,6 +30,10 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/comet-sepolicy/comet-sepolicy.mk include device/google/comet-sepolicy/comet-sepolicy.mk
include device/google/comet/wifi/BoardConfig-wifi.mk include device/google/comet/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif
else else
include device/google/comet23/comet23/BoardConfig.mk include device/google/comet23/comet23/BoardConfig.mk

View file

@ -393,3 +393,8 @@ SUPPORT_RIL_DOMAIN_SELECTION := true
# Thread HAL # Thread HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.comet.hardware.threadnetwork com.google.comet.hardware.threadnetwork
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif