Merge "Enable WM extensions on caiman and komomdo" into 24D1-dev

This commit is contained in:
Jiaming Liu 2024-03-18 03:43:43 +00:00 committed by Android (Google) Code Review
commit 0b76d843ff
3 changed files with 9 additions and 0 deletions

View file

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

View file

@ -378,6 +378,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork com.google.caimito.hardware.threadnetwork
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)

View file

@ -348,6 +348,9 @@ SUPPORT_RIL_DOMAIN_SELECTION := true
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
com.google.caimito.hardware.threadnetwork com.google.caimito.hardware.threadnetwork
# Window Extensions
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)