From b09ad5b9e78cd8490001f7ce1275af86c7a92ed5 Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Fri, 8 Mar 2024 12:36:26 -0800
Subject: [PATCH] komodo: add etm modules in userdebug/eng builds

Bug: 321061072
Test: build and run komodo
Change-Id: Ida1044c1d997f19b9072af3da233d3a781cd9e89
Merged-In: Ida1044c1d997f19b9072af3da233d3a781cd9e89
---
 device-komodo.mk      | 5 +++++
 komodo/BoardConfig.mk | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/device-komodo.mk b/device-komodo.mk
index 3a4d18d2..0bf7ba87 100644
--- a/device-komodo.mk
+++ b/device-komodo.mk
@@ -377,3 +377,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # 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
diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk
index 7ec39a22..ede93d49 100644
--- a/komodo/BoardConfig.mk
+++ b/komodo/BoardConfig.mk
@@ -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