From 30885811ec052352d00f681620021cbc110e307b 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 | 6 ++-- conf/init.gs101.rc | 4 +-- conf/init.recovery.device.rc | 2 +- device.mk | 36 +++++++++---------- dumpstate/dump_gs101.sh | 6 ++-- factory_common.mk | 4 +-- .../extension/fingerprint.extension.mk | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 366ce391..70cc6e9f 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -49,8 +49,8 @@ BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs -# Enable KUnit for userdebug and eng builds -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +# Enable KUnit for eng builds +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) BOARD_KERNEL_CMDLINE += kunit.enable=1 endif @@ -205,7 +205,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.gs101.rc b/conf/init.gs101.rc index 7185b2e1..a6e0bb50 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -635,8 +635,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 diff --git a/conf/init.recovery.device.rc b/conf/init.recovery.device.rc index c94d079f..118706da 100644 --- a/conf/init.recovery.device.rc +++ b/conf/init.recovery.device.rc @@ -3,7 +3,7 @@ on init setprop sys.usb.controller "11110000.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 848ad656..f7dc57ce 100644 --- a/device.mk +++ b/device.mk @@ -92,7 +92,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 @@ -113,7 +113,7 @@ endif include device/google/gs101/modem/user.mk -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 @@ -310,7 +310,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc endif @@ -350,7 +350,7 @@ PRODUCT_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 \ @@ -393,7 +393,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 @@ -454,7 +454,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml # 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 @@ -547,7 +547,7 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ConnectivityOverlay -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ f2fs_io \ check_f2fs \ f2fs.fibmap \ @@ -638,7 +638,7 @@ PRODUCT_PACKAGES += \ libdisplaycolor \ hwcomposer.$(TARGET_BOARD_PLATFORM) -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PACKAGES += displaycolor_service endif @@ -715,7 +715,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 @@ -781,7 +781,7 @@ ifeq (,$(filter tangor citron,$(subst _, ,$(TARGET_PRODUCT)))) include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/gs101/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs101/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ device/google/gs101/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf @@ -799,7 +799,7 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) include device/google/gs-common/trusty/trusty.mk # Trusty unit test tool -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ trusty-ut-ctrl \ tipc-test @@ -816,7 +816,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 @@ -860,8 +860,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 @@ -886,7 +886,7 @@ PRODUCT_PACKAGES += ShannonIms $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk) -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ preinstalled-packages-product-gs101-device-debug.xml PRODUCT_PACKAGES += ShannonRcs @@ -958,7 +958,7 @@ PRODUCT_COPY_FILES += \ device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv # Vibrator Diag -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ diag-vibrator \ diag-vibrator-cs40l25a \ diag-vibrator-drv2624 \ @@ -998,7 +998,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 \ @@ -1099,7 +1099,7 @@ endif include hardware/google/pixel/wifi_ext/device.mk # Battery Stats Viewer -PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer +PRODUCT_PACKAGES_ENG += BatteryStatsViewer # Install product specific framework compatibility matrix # (TODO: b/169535506) This includes the FCM for system_ext and product partition. diff --git a/dumpstate/dump_gs101.sh b/dumpstate/dump_gs101.sh index e5a72254..79b2bed7 100644 --- a/dumpstate/dump_gs101.sh +++ b/dumpstate/dump_gs101.sh @@ -161,7 +161,7 @@ cat "/sys/class/power_supply/main-charger/device/registers_dump" echo "\n------ max77729_pmic registers dump ------" cat /sys/devices/platform/10d50000.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" @@ -207,7 +207,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/ @@ -234,7 +234,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 5434fbf4..c5faafef 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -74,9 +74,9 @@ PRODUCT_PACKAGES += \ PRODUCT_SET_DEBUGFS_RESTRICTIONS := false # PixelLogger for RF testing -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ PixelLogger # Tool for installing Widevine keybox -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ WvInstallKeybox diff --git a/fingerprint/extension/fingerprint.extension.mk b/fingerprint/extension/fingerprint.extension.mk index 0cb220d1..2764fa3d 100644 --- a/fingerprint/extension/fingerprint.extension.mk +++ b/fingerprint/extension/fingerprint.extension.mk @@ -2,7 +2,7 @@ ifneq (,$(filter aosp% factory%, $(TARGET_PRODUCT))) # Skip if device is AOSP or factory build else - ifneq (,$(filter userdebug, $(TARGET_BUILD_VARIANT))) + ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) $(call soong_config_set,fp_hal_feature,report_bug_support,true) BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/ SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/