commit c6638def976e1e0cd06da838026aa5467ca77de1
author Ethan Chen <intervigil@gmail.com> Wed Nov 28 20:41:20 2018 -0800
committer Michael Bestas <mkbestas@lineageos.org> Sun Jun 15 19:15:37 2025 +0300
tree 26344e06f44f8a923aaf04f872eb0fc9e4fe027e
parent b3d2fee9bf2b42569aef7318b84b17026adfc597

pixel: Disable userdebug diagnostics

* We can't make use of most of the debug features on userdebug builds.

Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f

citadel/citadel.mk

diff --git a/citadel/citadel.mk b/citadel/citadel.mk
index fa7c5c3..783eff7 100644
--- a/citadel/citadel.mk
+++ b/citadel/citadel.mk
@@ -41,7 +41,7 @@
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/citadel
 
 # USERDEBUG ONLY: Install test packages
-ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \
                           pwntest \
                           nugget_targeted_tests

common/pixel-common-device.mk

diff --git a/common/pixel-common-device.mk b/common/pixel-common-device.mk
index 947caa1..23a04c2 100644
--- a/common/pixel-common-device.mk
+++ b/common/pixel-common-device.mk
@@ -19,17 +19,17 @@
 
 # Pixel Experience
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 PRODUCT_PACKAGES_DEBUG += wifi_diagnostic
 BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/wifi_diagnostic
 endif
 endif
 
-PRODUCT_PACKAGES_DEBUG += wifi_sniffer
+PRODUCT_PACKAGES_ENG += wifi_sniffer
 BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/wifi_sniffer
 
-PRODUCT_PACKAGES_DEBUG += wifi_perf_diag
+PRODUCT_PACKAGES_ENG += wifi_perf_diag
 BOARD_VENDOR_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/wifi_perf_diag
 
 # Enable whole-program R8 Java optimizations for SystemUI and system_server,

mm/device.mk

diff --git a/mm/device.mk b/mm/device.mk
index 656ecb4..ae6180c 100644
--- a/mm/device.mk
+++ b/mm/device.mk
@@ -1,7 +1,7 @@
 PRODUCT_COPY_FILES += \
       hardware/google/pixel/mm/pixel-mm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm.rc
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
     mm_logd
 endif

mm/device_gki.mk

diff --git a/mm/device_gki.mk b/mm/device_gki.mk
index eac30a7..5eb58ab 100644
--- a/mm/device_gki.mk
+++ b/mm/device_gki.mk
@@ -11,7 +11,7 @@
       hardware/google/pixel/mm/fstab.zram.50p-1g:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.zram.50p-1g \
       hardware/google/pixel/mm/fstab.zram.50p-2g:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.zram.50p-2g
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
     mm_logd
 endif

mm/device_legacy.mk

diff --git a/mm/device_legacy.mk b/mm/device_legacy.mk
index d32648a..9b8aa45 100644
--- a/mm/device_legacy.mk
+++ b/mm/device_legacy.mk
@@ -1,7 +1,7 @@
 PRODUCT_COPY_FILES += \
       hardware/google/pixel/mm/pixel-mm-legacy.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pixel-mm-legacy.rc
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
     mm_logd
 endif