Merge changes from topic "add_etm_modules_pixel_2024" into main

* changes:
  tokay: add etm modules in userdebug/eng builds
  komodo: add etm modules in userdebug/eng builds
This commit is contained in:
Yabin Cui 2024-03-14 17:41:39 +00:00 committed by Android (Google) Code Review
commit 5852dd3125
4 changed files with 18 additions and 0 deletions

View file

@ -391,3 +391,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif

View file

@ -361,3 +361,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif

View file

@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/komodo-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif

View file

@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/tokay-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif