From c6b2f7fb80f0b1beee79b68bb4ec104a0227fa4a Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 28 Nov 2018 20:41:20 -0800 Subject: [PATCH] Disable userdebug diagnostics * We can't make use of most of the debug features on userdebug builds. Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f --- BoardConfig-common.mk | 2 +- conf/init.gs201.rc | 15 +++++++-------- conf/init.recovery.device.rc | 2 +- device.mk | 36 +++++++++++++++++------------------ dumpstate/dump_power_gs201.sh | 8 ++++---- factory_common.mk | 2 +- 6 files changed, 32 insertions(+), 33 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 457950f9..67669838 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -230,7 +230,7 @@ BOARD_USES_GENERIC_AUDIO := true $(call soong_config_set,aoc_audio_func,ext_hidl,true) -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) $(call soong_config_set,aoc_audio_func,dump_usecase_data,true) $(call soong_config_set,aoc_audio_func,hal_socket_control,true) $(call soong_config_set,aoc_audio_func,record_tuning_keys,true) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index f4bc6eac..aa8617ce 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -2,12 +2,11 @@ import /vendor/etc/init/hw/init.gs201.usb.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc -on early-init && property:ro.debuggable=1 - # Convert /dev/block/by-name/persist to ext4 on userdebug builds only +on early-init && property:ro.build.type=eng + # Convert /dev/block/by-name/persist to ext4 on eng builds only exec -- /system_ext/bin/convert_to_ext4.sh /dev/block/by-name/persist false - mount_all /vendor/etc/fstab.persist --early -on early-init && property:ro.debuggable=0 +on early-init mount_all /vendor/etc/fstab.persist --early on init @@ -621,8 +620,8 @@ service abox /vendor/bin/main_abox 17c50000.abox group audioserver seclabel u:r:abox:s0 -# on userdebug and eng builds, enable kgdb on the serial console -on property:ro.debuggable=1 +# on eng builds, enable kgdb on the serial console +on property:ro.build.type=eng write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1 write /sys/module/fiq_debugger/parameters/kgdb_enable 1 @@ -834,8 +833,8 @@ on property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte setprop persist.vendor.charge.start.level 0 setprop vendor.battery.defender.disable 1 -# on userdebug and eng builds, enable scsi error recovery log -on property:ro.debuggable=1 +# on eng builds, enable scsi error recovery log +on property:ro.build.type=eng write /sys/module/scsi_mod/parameters/scsi_logging_level 63 service init_display /vendor/bin/init.display.sh diff --git a/conf/init.recovery.device.rc b/conf/init.recovery.device.rc index 592efbd3..2d49d83f 100644 --- a/conf/init.recovery.device.rc +++ b/conf/init.recovery.device.rc @@ -3,7 +3,7 @@ on init setprop sys.usb.controller "11210000.dwc3" setprop sys.usb.configfs 1 -on init && property:ro.debuggable=1 && property:ro.boot.mode=recovery +on init && property:ro.build.type=eng && property:ro.boot.mode=recovery start recovery-console service recovery-console /system/bin/sh diff --git a/device.mk b/device.mk index 0032eb9e..0b42a190 100644 --- a/device.mk +++ b/device.mk @@ -98,7 +98,7 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) endif -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) #Set IKE logs to verbose for WFC PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE @@ -117,7 +117,7 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG include device/google/gs201/modem/userdebug.mk endif -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) # b/36703476: Set default log size to 1M PRODUCT_PROPERTY_OVERRIDES += \ ro.logd.size=1M @@ -349,7 +349,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \ device/google/gs201/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh @@ -382,7 +382,7 @@ PRODUCT_HOST_PACKAGES += \ # CHRE ## tools -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += \ chre_power_test_client \ chre_test_client \ @@ -468,7 +468,7 @@ PRODUCT_COPY_FILES += \ endif # default usb debug functions -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.usb.usbradio.config=dm endif @@ -580,7 +580,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ConnectivityOverlay -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ f2fs_io \ check_f2fs \ f2fs.fibmap \ @@ -611,7 +611,7 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) include device/google/gs-common/dauntless/gsc.mk endif -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ WvInstallKeybox # Copy Camera HFD Setfiles @@ -665,7 +665,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.slsi_platform=1 \ debug.hwc.winupdate=1 -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += displaycolor_service endif @@ -743,7 +743,7 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += wpa_cli PRODUCT_PACKAGES += hostapd_cli endif @@ -812,7 +812,7 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) include device/google/gs-common/trusty/trusty.mk # Trusty unit test and code coverage tool -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ trusty-ut-ctrl \ tipc-test \ trusty_stats_test \ @@ -841,7 +841,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.frp.pst=/dev/block/by-name/frp # System props to enable Bluetooth Quality Report (BQR) feature -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask?=262174 \ persist.bluetooth.bqr.min_interval_ms=500 @@ -885,8 +885,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ Iwlan -#Iwlan test app for userdebug/eng builds -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +#Iwlan test app for eng builds +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += \ IwlanTestApp endif @@ -909,7 +909,7 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA PRODUCT_PACKAGES += ShannonIms -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ preinstalled-packages-product-gs201-device-debug.xml PRODUCT_PACKAGES += ShannonRcs @@ -952,7 +952,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.sys.modem.logging.enable=true # Enable silent CP crash handling -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.ril.crash_handling_mode=1 else @@ -997,7 +997,7 @@ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.nprf \ # Vibrator Diag -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ diag-vibrator \ diag-vibrator-cs40l25a \ diag-vibrator-drv2624 \ @@ -1040,7 +1040,7 @@ PRODUCT_PACKAGES += vndservicemanager PRODUCT_PACKAGES += vndservice ## TinyTools, debug tool and cs35l41 speaker calibration tool for Audio -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += \ tinyplay \ tinycap \ @@ -1138,7 +1138,7 @@ USES_RADIOEXT_V1_5 = true include hardware/google/pixel/wifi_ext/device.mk # Battery Stats Viewer -PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer +PRODUCT_PACKAGES_ENG += BatteryStatsViewer PRODUCT_PACKAGES += dump_power_gs201.sh # Install product specific framework compatibility matrix diff --git a/dumpstate/dump_power_gs201.sh b/dumpstate/dump_power_gs201.sh index 64d75566..1a4fdc03 100644 --- a/dumpstate/dump_power_gs201.sh +++ b/dumpstate/dump_power_gs201.sh @@ -88,7 +88,7 @@ if [ -e "/dev/logbuffer_tcpm" ] then echo "\n------ Logbuffer TCPM ------" cat "/dev/logbuffer_tcpm" -elif [ $build_type = "userdebug" ] +elif [ $build_type = "eng" ] then echo "\n------ TCPM logs ------" if [ -d "/sys/kernel/debug/tcpm" ] @@ -172,7 +172,7 @@ cat "/sys/class/power_supply/main-charger/device/registers_dump" echo "\n------ max77729_pmic registers dump ------" cat /sys/devices/platform/*.hsi2c/i2c-*/*-0066/registers_dump -if [ $build_type = "userdebug" ] +if [ $build_type = "eng" ] then echo "\n------ Charging table dump ------" cat "/d/google_battery/chg_raw_profile" @@ -226,7 +226,7 @@ fi echo "\n------ Charger Stats ------" cat "/sys/class/power_supply/battery/charge_details" -if [ $build_type = "userdebug" ] +if [ $build_type = "eng" ] then echo "\n------ Google Charger ------" cd /sys/kernel/debug/google_charger/ @@ -253,7 +253,7 @@ cat "/sys/class/power_supply/wireless/device/fw_rev" echo "\n------ RTX ------" cat "/dev/logbuffer_rtx" -if [ $build_type = "userdebug" ] +if [ $build_type = "eng" ] then echo "\n------ gvotables ------" cat /sys/kernel/debug/gvotables/*/status diff --git a/factory_common.mk b/factory_common.mk index fc745873..071a8e7d 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -81,5 +81,5 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # PixelLogger for RF testing -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ PixelLogger \