Disable userdebug diagnostics

Change-Id: Icbdc3a61ab7b27f2aa0a6a07181b96edd9ee191a
This commit is contained in:
Michael Bestas 2023-10-18 17:38:24 +03:00
parent 35f66e77be
commit d26fdcfef2
No known key found for this signature in database
GPG Key ID: CC95044519BE6669
23 changed files with 23 additions and 24 deletions

View File

@ -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 device/google/gs-common/aoc/conf/init.aoc.daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.aoc.rc
# AoC debug support # AoC debug support
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
aocdump \ aocdump \
aocutil \ aocutil \
aoc_audio_cfg \ aoc_audio_cfg \

View File

@ -1,7 +1,7 @@
ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES += battery_mitigation PRODUCT_PACKAGES += battery_mitigation
endif endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
ifeq (,$(filter factory_%,$(TARGET_PRODUCT))) ifeq (,$(filter factory_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES += BrownoutDetection PRODUCT_PACKAGES += BrownoutDetection
endif endif

View File

@ -1,3 +1,3 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/bcmbt/dump/sepolicy/
PRODUCT_PACKAGES_DEBUG += dump_bcmbt PRODUCT_PACKAGES_ENG += dump_bcmbt

View File

@ -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_PUBLIC_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/public
PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private PRODUCT_PRIVATE_SEPOLICY_DIRS += device/google/gs-common/camera/sepolicy/product/private
PRODUCT_PACKAGES_DEBUG += dump_camera PRODUCT_PACKAGES_ENG += dump_camera

View File

@ -31,8 +31,8 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
# Calibration tool for debug builds # Calibration tool for debug builds
PRODUCT_PACKAGES_DEBUG += tarasque_test PRODUCT_PACKAGES_ENG += tarasque_test
PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator PRODUCT_PACKAGES_ENG += ProtoCalibGenerator
endif # vendor/google/camera check endif # vendor/google/camera check

View File

@ -15,7 +15,7 @@ PRODUCT_PACKAGES += \
dump_gsc.sh dump_gsc.sh
# USERDEBUG ONLY: Install test packages # USERDEBUG ONLY: Install test packages
PRODUCT_PACKAGES_DEBUG += citadel_integration_tests \ PRODUCT_PACKAGES_ENG += citadel_integration_tests \
pwntest \ pwntest \
nugget_targeted_tests \ nugget_targeted_tests \
CitadelProvision \ CitadelProvision \

View File

@ -1,4 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy 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 PRODUCT_PACKAGES += dump_display

View File

@ -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_dsim0
chown system system /dev/logbuffer_dsim1 chown system system /dev/logbuffer_dsim1

View File

@ -13,5 +13,5 @@ PRODUCT_PACKAGES += \
sitril-gps \ sitril-gps \
android.hardware.location.gps.prebuilt.xml android.hardware.location.gps.prebuilt.xml
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
init.gps_log.rc init.gps_log.rc

View File

@ -1,4 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/dump/sepolicy/ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gps/dump/sepolicy/
PRODUCT_PACKAGES_DEBUG += dump_gps PRODUCT_PACKAGES_ENG += dump_gps

View File

@ -7,7 +7,7 @@ PRODUCT_PACKAGES += \
# GXP C-API library # GXP C-API library
PRODUCT_PACKAGES += libgxp PRODUCT_PACKAGES += libgxp
# GXP Debug dump. # GXP Debug dump.
PRODUCT_PACKAGES_DEBUG += dump_gxp PRODUCT_PACKAGES_ENG += dump_gxp
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gxp/sepolicy

View File

@ -1,5 +1,5 @@
# Specific build for fingerprint # Specific build for fingerprint
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
Gyotaku Gyotaku
BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/fingerprint BOARD_SEPOLICY_DIRS += device/google/gs-common/gyotaku_app/fingerprint

View File

@ -1,3 +1,3 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/led/sepolicy BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/led/sepolicy
PRODUCT_PACKAGES_DEBUG += dump_led PRODUCT_PACKAGES_ENG += dump_led

View File

@ -9,7 +9,7 @@ DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/pixel_ril/co
PRODUCT_PACKAGES += ril-extension PRODUCT_PACKAGES += ril-extension
PRODUCT_PACKAGES_DEBUG += libgooglerilmemmonitor PRODUCT_PACKAGES_ENG += libgooglerilmemmonitor
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/google/tools/ril-extension-service \ vendor/google/tools/ril-extension-service \

View File

@ -1,4 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/radio/sepolicy/ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/radio/sepolicy/
PRODUCT_PACKAGES_DEBUG += dump_radio PRODUCT_PACKAGES_ENG += dump_radio

View File

@ -1,7 +1,7 @@
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
sscoredump \ sscoredump \
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
dump_ramdump \ dump_ramdump \
ramdump \ ramdump \

View File

@ -1,5 +1,5 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/soc/sepolicy/soc BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/soc/sepolicy/soc
PRODUCT_PACKAGES += dump_soc PRODUCT_PACKAGES += dump_soc
PRODUCT_PACKAGES_DEBUG += dump_memory PRODUCT_PACKAGES_ENG += dump_memory

View File

@ -179,7 +179,7 @@ int main() {
printf("\n------ UFS error history ------\n"); printf("\n------ UFS error history ------\n");
std::string build_type = android::base::GetProperty(BUILD_TYPE_PROPERTY, ""); 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::string sg_read_buffer = "/vendor/bin/sg_read_buffer";
std::ifstream sg_read_buffer_file(sg_read_buffer.c_str()); std::ifstream sg_read_buffer_file(sg_read_buffer.c_str());
if (sg_read_buffer_file.is_open()) { if (sg_read_buffer_file.is_open()) {

View File

@ -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 write /dev/sys/block/bootdevice/pixel/enable_pixel_ufs_logging 1
chown system /dev/sg3 chown system /dev/sg3

View File

@ -3,6 +3,6 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy
PRODUCT_PACKAGES += dump_storage PRODUCT_PACKAGES += dump_storage
# Pixel storage tool # Pixel storage tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sg_write_buffer \ sg_write_buffer \
sg_read_buffer sg_read_buffer

View File

@ -4,7 +4,6 @@ PRODUCT_PACKAGES += android.hardware.thermal-service.pixel
PRODUCT_PACKAGES += thermal_symlinks PRODUCT_PACKAGES += thermal_symlinks
# Thermal logd # Thermal logd
PRODUCT_PACKAGES_DEBUG += thermal_logd
PRODUCT_PACKAGES_ENG += thermal_logd PRODUCT_PACKAGES_ENG += thermal_logd
BOARD_SEPOLICY_DIRS += device/google/gs-common/thermal/sepolicy/thermal_hal BOARD_SEPOLICY_DIRS += device/google/gs-common/thermal/sepolicy/thermal_hal

View File

@ -1,3 +1,3 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/touchinspector/sepolicy BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/touch/touchinspector/sepolicy
PRODUCT_PACKAGES_DEBUG += TouchInspector PRODUCT_PACKAGES_ENG += TouchInspector

View File

@ -1,4 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/wlan/sepolicy/ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/wlan/sepolicy/
PRODUCT_PACKAGES_DEBUG += dump_wlan PRODUCT_PACKAGES_ENG += dump_wlan