Snap for 12327203 from e0fcb2d3ba011bc7a5a2ea08f57d69b70863c486 to 24Q4-release
Change-Id: Iad2add644e5f34895ee126af372d2f56cd4ef421
diff --git a/device-oriole.mk b/device-oriole.mk
index 65bff71..10048c9 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -347,3 +347,10 @@
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20486
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-raven.mk b/device-raven.mk
index 4ada8b4..8b790d9 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -357,3 +357,10 @@
# Bluetooth device id
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20487
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 36affb6..00a9a28 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -43,3 +43,9 @@
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index eb1a5c8..783511a 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -43,3 +43,9 @@
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif