summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan Chen <intervigil@gmail.com>2018-11-28 20:41:20 -0800
committerMichael Bestas <mkbestas@lineageos.org>2023-10-18 18:24:45 +0300
commit41d46990a039264bf7008b1d4c04899373c25973 (patch)
tree6b4c8b4f6de0520f89112b69b31acac6377131b8
parentb8fc6c97a76a75b19d9d3293baf9234910c5c929 (diff)
pixel: Disable userdebug diagnostics
* We can't make use of most of the debug features on userdebug builds. Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f
-rw-r--r--common/pixel-common-device.mk5
-rw-r--r--mm/device.mk2
-rw-r--r--mm/device_gki.mk2
-rw-r--r--mm/device_legacy.mk2
-rw-r--r--thermal/device.mk2
5 files changed, 7 insertions, 6 deletions
diff --git a/common/pixel-common-device.mk b/common/pixel-common-device.mk
index d191c46..f96eebf 100644
--- a/common/pixel-common-device.mk
+++ b/common/pixel-common-device.mk
@@ -26,7 +26,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
# 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
@@ -59,5 +59,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
dalvik.vm.systemuicompilerfilter=speed
# Virtual fingerprint HAL
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example
-
+endif
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
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 @@ PRODUCT_COPY_FILES += \
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
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
diff --git a/thermal/device.mk b/thermal/device.mk
index 1d71d31..58b0cbb 100644
--- a/thermal/device.mk
+++ b/thermal/device.mk
@@ -5,7 +5,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
thermal_symlinks
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
thermal_logd
endif