From d26fdcfef2d871100a017c85ce143dfdb94269e9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 18 Oct 2023 17:38:24 +0300 Subject: [PATCH] Disable userdebug diagnostics Change-Id: Icbdc3a61ab7b27f2aa0a6a07181b96edd9ee191a --- aoc/aoc.mk | 2 +- battery_mitigation/bcl.mk | 2 +- bcmbt/dump/dumplog.mk | 2 +- camera/dump.mk | 2 +- camera/lyric.mk | 4 ++-- dauntless/gsc.mk | 2 +- display/dump.mk | 2 +- display_logbuffer/init.display_logbuffer.rc | 2 +- gps/brcm/device.mk | 2 +- gps/dump/log.mk | 2 +- gxp/gxp.mk | 2 +- gyotaku_app/gyotaku_fingerprint.mk | 2 +- led/led.mk | 2 +- pixel_ril/ril.mk | 2 +- radio/dump.mk | 2 +- ramdump_and_coredump/ramdump_and_coredump.mk | 2 +- soc/soc.mk | 2 +- storage/dump_storage.cpp | 2 +- storage/init.storage.rc | 2 +- storage/storage.mk | 2 +- thermal/thermal_hal/device.mk | 1 - touch/touchinspector/touchinspector.mk | 2 +- wlan/dump.mk | 2 +- 23 files changed, 23 insertions(+), 24 deletions(-) diff --git a/aoc/aoc.mk b/aoc/aoc.mk index 877ace0..e06105e 100644 --- a/aoc/aoc.mk +++ b/aoc/aoc.mk @@ -15,7 +15,7 @@ PRODUCT_COPY_FILES += \ device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc # AoC debug support -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ aocdump \ aocutil \ aoc_audio_cfg \ diff --git a/battery_mitigation/bcl.mk b/battery_mitigation/bcl.mk index 5bf1a25..28276a6 100644 --- a/battery_mitigation/bcl.mk +++ b/battery_mitigation/bcl.mk @@ -1,7 +1,7 @@ ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES += battery_mitigation endif -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) PRODUCT_PACKAGES += BrownoutDetection endif diff --git a/bcmbt/dump/dumplog.mk b/bcmbt/dump/dumplog.mk index 8dc1765..7789695 100644 --- a/bcmbt/dump/dumplog.mk +++ b/bcmbt/dump/dumplog.mk @@ -1,3 +1,3 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/ -PRODUCT_PACKAGES_DEBUG += dump_bcmbt +PRODUCT_PACKAGES_ENG += dump_bcmbt diff --git a/camera/dump.mk b/camera/dump.mk index 8569610..af8c5ca 100644 --- a/camera/dump.mk +++ b/camera/dump.mk @@ -2,5 +2,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/vendor PRODUCT_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/public PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private -PRODUCT_PACKAGES_DEBUG += dump_camera +PRODUCT_PACKAGES_ENG += dump_camera diff --git a/camera/lyric.mk b/camera/lyric.mk index 7762f4d..c16fb8c 100644 --- a/camera/lyric.mk +++ b/camera/lyric.mk @@ -31,8 +31,8 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage # Calibration tool for debug builds -PRODUCT_PACKAGES_DEBUG += tarasque_test -PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator +PRODUCT_PACKAGES_ENG += tarasque_test +PRODUCT_PACKAGES_ENG += ProtoCalibGenerator endif # vendor/google/camera check diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk index 188d9f9..d7f53b3 100644 --- a/dauntless/gsc.mk +++ b/dauntless/gsc.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGES += \ dump_gsc.sh # USERDEBUG ONLY: Install test packages -PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \ +PRODUCT_PACKAGES_ENG += citadel_integration_tests \ pwntest \ nugget_targeted_tests \ CitadelProvision \ diff --git a/display/dump.mk b/display/dump.mk index 2af14da..250ef39 100644 --- a/display/dump.mk +++ b/display/dump.mk @@ -1,4 +1,4 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy -PRODUCT_PACKAGES_DEBUG += dump_display_userdebug.sh +PRODUCT_PACKAGES_ENG += dump_display_userdebug.sh PRODUCT_PACKAGES += dump_display diff --git a/display_logbuffer/init.display_logbuffer.rc b/display_logbuffer/init.display_logbuffer.rc index 2a39ce3..717b7f0 100644 --- a/display_logbuffer/init.display_logbuffer.rc +++ b/display_logbuffer/init.display_logbuffer.rc @@ -1,3 +1,3 @@ -on property:ro.build.type=userdebug +on property:ro.build.type=eng chown system system /dev/logbuffer_dsim0 chown system system /dev/logbuffer_dsim1 diff --git a/gps/brcm/device.mk b/gps/brcm/device.mk index 45b4eb0..d1c432e 100644 --- a/gps/brcm/device.mk +++ b/gps/brcm/device.mk @@ -13,5 +13,5 @@ PRODUCT_PACKAGES += \ sitril-gps \ android.hardware.location.gps.prebuilt.xml -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ init.gps_log.rc diff --git a/gps/dump/log.mk b/gps/dump/log.mk index d977cb2..71c218f 100644 --- a/gps/dump/log.mk +++ b/gps/dump/log.mk @@ -1,4 +1,4 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/dump/sepolicy/ -PRODUCT_PACKAGES_DEBUG += dump_gps +PRODUCT_PACKAGES_ENG += dump_gps diff --git a/gxp/gxp.mk b/gxp/gxp.mk index 45b0f08..2249537 100644 --- a/gxp/gxp.mk +++ b/gxp/gxp.mk @@ -7,7 +7,7 @@ PRODUCT_PACKAGES += \ # GXP C-API library PRODUCT_PACKAGES += libgxp # GXP Debug dump. -PRODUCT_PACKAGES_DEBUG += dump_gxp +PRODUCT_PACKAGES_ENG += dump_gxp BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy diff --git a/gyotaku_app/gyotaku_fingerprint.mk b/gyotaku_app/gyotaku_fingerprint.mk index 051b88e..91a386d 100644 --- a/gyotaku_app/gyotaku_fingerprint.mk +++ b/gyotaku_app/gyotaku_fingerprint.mk @@ -1,5 +1,5 @@ # Specific build for fingerprint -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ Gyotaku BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/fingerprint diff --git a/led/led.mk b/led/led.mk index 81d0f33..d367042 100644 --- a/led/led.mk +++ b/led/led.mk @@ -1,3 +1,3 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/led/sepolicy -PRODUCT_PACKAGES_DEBUG += dump_led +PRODUCT_PACKAGES_ENG += dump_led diff --git a/pixel_ril/ril.mk b/pixel_ril/ril.mk index 37274aa..3cc468a 100644 --- a/pixel_ril/ril.mk +++ b/pixel_ril/ril.mk @@ -9,7 +9,7 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/pixel_ril/co PRODUCT_PACKAGES += ril-extension -PRODUCT_PACKAGES_DEBUG += libgooglerilmemmonitor +PRODUCT_PACKAGES_ENG += libgooglerilmemmonitor PRODUCT_SOONG_NAMESPACES += \ vendor/google/tools/ril-extension-service \ diff --git a/radio/dump.mk b/radio/dump.mk index 0c4d09d..c25c1e2 100644 --- a/radio/dump.mk +++ b/radio/dump.mk @@ -1,4 +1,4 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/radio/sepolicy/ -PRODUCT_PACKAGES_DEBUG += dump_radio +PRODUCT_PACKAGES_ENG += dump_radio diff --git a/ramdump_and_coredump/ramdump_and_coredump.mk b/ramdump_and_coredump/ramdump_and_coredump.mk index c50aeb6..3ccc019 100644 --- a/ramdump_and_coredump/ramdump_and_coredump.mk +++ b/ramdump_and_coredump/ramdump_and_coredump.mk @@ -1,7 +1,7 @@ PRODUCT_PACKAGES += \ sscoredump \ -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ dump_ramdump \ ramdump \ diff --git a/soc/soc.mk b/soc/soc.mk index 8ec9412..10541cd 100644 --- a/soc/soc.mk +++ b/soc/soc.mk @@ -1,5 +1,5 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/soc/sepolicy/soc PRODUCT_PACKAGES += dump_soc -PRODUCT_PACKAGES_DEBUG += dump_memory +PRODUCT_PACKAGES_ENG += dump_memory diff --git a/storage/dump_storage.cpp b/storage/dump_storage.cpp index e6b3e4c..3ed23b7 100644 --- a/storage/dump_storage.cpp +++ b/storage/dump_storage.cpp @@ -179,7 +179,7 @@ int main() { printf("\n------ UFS error history ------\n"); std::string build_type = android::base::GetProperty(BUILD_TYPE_PROPERTY, ""); - if (build_type == "userdebug") { + if (build_type == "eng") { std::string sg_read_buffer = "/vendor/bin/sg_read_buffer"; std::ifstream sg_read_buffer_file(sg_read_buffer.c_str()); if (sg_read_buffer_file.is_open()) { diff --git a/storage/init.storage.rc b/storage/init.storage.rc index 9cad2ea..855850e 100644 --- a/storage/init.storage.rc +++ b/storage/init.storage.rc @@ -1,4 +1,4 @@ -on property:ro.build.type=userdebug +on property:ro.build.type=eng write /dev/sys/block/bootdevice/pixel/enable_pixel_ufs_logging 1 chown system /dev/sg3 diff --git a/storage/storage.mk b/storage/storage.mk index ee7110c..eafed3d 100644 --- a/storage/storage.mk +++ b/storage/storage.mk @@ -3,6 +3,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy PRODUCT_PACKAGES += dump_storage # Pixel storage tool -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ sg_write_buffer \ sg_read_buffer diff --git a/thermal/thermal_hal/device.mk b/thermal/thermal_hal/device.mk index 260b59f..50959a7 100644 --- a/thermal/thermal_hal/device.mk +++ b/thermal/thermal_hal/device.mk @@ -4,7 +4,6 @@ PRODUCT_PACKAGES += android.hardware.thermal-service.pixel PRODUCT_PACKAGES += thermal_symlinks # Thermal logd -PRODUCT_PACKAGES_DEBUG += thermal_logd 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..e3bb67e 100644 --- a/touch/touchinspector/touchinspector.mk +++ b/touch/touchinspector/touchinspector.mk @@ -1,3 +1,3 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/touchinspector/sepolicy -PRODUCT_PACKAGES_DEBUG += TouchInspector +PRODUCT_PACKAGES_ENG += TouchInspector diff --git a/wlan/dump.mk b/wlan/dump.mk index 1d90d22..23c75cb 100644 --- a/wlan/dump.mk +++ b/wlan/dump.mk @@ -1,4 +1,4 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/wlan/sepolicy/ -PRODUCT_PACKAGES_DEBUG += dump_wlan +PRODUCT_PACKAGES_ENG += dump_wlan