From e38771d621c13357498746a17a8841d2046d4b6d Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Wed, 13 Mar 2024 11:13:16 -0700
Subject: [PATCH] tokay: add etm modules in userdebug/eng builds

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

diff --git a/device-tokay.mk b/device-tokay.mk
index b283923f..1168ddf5 100644
--- a/device-tokay.mk
+++ b/device-tokay.mk
@@ -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
diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk
index d09779b9..7cf14bc7 100644
--- a/tokay/BoardConfig.mk
+++ b/tokay/BoardConfig.mk
@@ -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