From 811212e50502a3e1af5f46279338942365890e2d Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 7 Sep 2024 16:30:30 +0300 Subject: [PATCH] fixup! Disable userdebug diagnostics Change-Id: I9ec35b51e3414bded1945b7035372d91ef960414 --- bcmbt/dump/dumplog.mk | 2 ++ gxp/gxp.mk | 2 ++ radio/dump.mk | 3 ++- thermal/thermal_hal/device.mk | 2 ++ touch/touchinspector/touchinspector.mk | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bcmbt/dump/dumplog.mk b/bcmbt/dump/dumplog.mk index 8dc1765..50588c1 100644 --- a/bcmbt/dump/dumplog.mk +++ b/bcmbt/dump/dumplog.mk @@ -1,3 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/ +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += dump_bcmbt +endif diff --git a/gxp/gxp.mk b/gxp/gxp.mk index 45b0f08..5270042 100644 --- a/gxp/gxp.mk +++ b/gxp/gxp.mk @@ -7,7 +7,9 @@ PRODUCT_PACKAGES += \ # GXP C-API library PRODUCT_PACKAGES += libgxp # GXP Debug dump. +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += dump_gxp +endif BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy diff --git a/radio/dump.mk b/radio/dump.mk index 0c4d09d..41972df 100644 --- a/radio/dump.mk +++ b/radio/dump.mk @@ -1,4 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/radio/sepolicy/ +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += dump_radio - +endif diff --git a/thermal/thermal_hal/device.mk b/thermal/thermal_hal/device.mk index 260b59f..8500670 100644 --- a/thermal/thermal_hal/device.mk +++ b/thermal/thermal_hal/device.mk @@ -4,7 +4,9 @@ PRODUCT_PACKAGES += android.hardware.thermal-service.pixel PRODUCT_PACKAGES += thermal_symlinks # Thermal logd +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += thermal_logd +endif PRODUCT_PACKAGES_ENG += thermal_logd BOARD_SEPOLICY_DIRS += device/google/gs-common/thermal/sepolicy/thermal_hal diff --git a/touch/touchinspector/touchinspector.mk b/touch/touchinspector/touchinspector.mk index d17d8dc..0f6ae96 100644 --- a/touch/touchinspector/touchinspector.mk +++ b/touch/touchinspector/touchinspector.mk @@ -1,3 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/touchinspector/sepolicy +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES_DEBUG += TouchInspector +endif