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

This commit is contained in:
Yabin Cui 2024-03-04 18:36:10 +00:00 committed by Android (Google) Code Review
commit 2bda846652
3 changed files with 16 additions and 0 deletions

View file

@ -27,3 +27,7 @@ include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk
include device/google/caimito-sepolicy/caiman-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

@ -71,3 +71,10 @@ on property:sys.boot_completed=1
chown system input /dev/touch_offload
chmod 660 /dev/touch_offload
start twoshay
# ETM
on init && property:ro.build.flavor=caiman-userdebug
import /vendor/etc/init/hw/init.etm.rc
on init && property:ro.build.flavor=caiman-eng
import /vendor/etc/init/hw/init.etm.rc

View file

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