Evolution-X-Tensor/device_google_zumapro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable userdebug diagnostics

Browse source 
* We can't make use of most of the debug features on userdebug builds.

Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f
This commit is contained in:
Ethan Chen 2018-11-28 20:41:20 -08:00 • committed by Michael Bestas
parent 3f2d56e32a
commit badbb52bed
No known key found for this signature in database
5 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
BoardConfig-common.mk
View file

@ -46,8 +46,8 @@ BOARD_KERNEL_CMDLINE += kasan=off
endif endif
BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs
# Enable KUnit for userdebug and eng builds # Enable KUnit for eng builds
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
BOARD_KERNEL_CMDLINE += kunit.enable=1 BOARD_KERNEL_CMDLINE += kunit.enable=1
endif endif
@ -238,7 +238,7 @@ BOARD_USES_GENERIC_AUDIO := true
$(call soong_config_set,aoc_audio_func,ext_hidl,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,dump_usecase_data,true)
$(call soong_config_set,aoc_audio_func,hal_socket_control,true) $(call soong_config_set,aoc_audio_func,hal_socket_control,true)
$(call soong_config_set,aoc_audio_func,record_tuning_keys,true) $(call soong_config_set,aoc_audio_func,record_tuning_keys,true)

2
conf/init.recovery.device.rc
View file

@ -3,7 +3,7 @@ on init
setprop sys.usb.controller "11210000.dwc3" setprop sys.usb.controller "11210000.dwc3"
setprop sys.usb.configfs 1 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 start recovery-console
service recovery-console /system/bin/sh service recovery-console /system/bin/sh

4
conf/init.zumapro.board.rc
View file

@ -459,8 +459,8 @@ service abox /vendor/bin/main_abox 17c50000.abox
group audioserver group audioserver
seclabel u:r:abox:s0 seclabel u:r:abox:s0
# on userdebug and eng builds, enable kgdb on the serial console # on eng builds, enable kgdb on the serial console
on property:ro.debuggable=1 on property:ro.build.type=eng
write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1 write /sys/module/kgdboc/parameters/kgdboc ttyFIQ1
write /sys/module/fiq_debugger/parameters/kgdb_enable 1 write /sys/module/fiq_debugger/parameters/kgdb_enable 1

42
device.mk
View file

@ -100,7 +100,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC #Set IKE logs to verbose for WFC
PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE
@ -119,7 +119,7 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG
include device/google/zumapro/modem/userdebug.mk include device/google/zumapro/modem/userdebug.mk
endif endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# b/36703476: Set default log size to 1M # b/36703476: Set default log size to 1M
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.logd.size=1M ro.logd.size=1M
@ -206,7 +206,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2 telephony.active_modems.max_count=2
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.usb.displayport.enabled=1 persist.vendor.usb.displayport.enabled=1
else else
@ -242,7 +242,7 @@ PRODUCT_PACKAGES += modem_ml_svc_sit
# endif # endif
# modem ML models configs # modem ML models configs
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \
device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf
@ -432,7 +432,7 @@ PRODUCT_COPY_FILES += \
device/google/zumapro/conf/init.zuma.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.soc.rc \ device/google/zumapro/conf/init.zuma.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.soc.rc \
device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/zumapro/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc device/google/zumapro/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -478,7 +478,7 @@ PRODUCT_PACKAGES += \
# CHRE # CHRE
## tools ## tools
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
chre_power_test_client \ chre_power_test_client \
chre_test_client \ chre_test_client \
@ -486,7 +486,7 @@ PRODUCT_PACKAGES += \
endif endif
# PCIe # PCIe
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
factory_pcie factory_pcie
endif endif
@ -530,7 +530,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.sys.modem.logging.enable=true persist.vendor.sys.modem.logging.enable=true
# Enable silent CP crash handling # Enable silent CP crash handling
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.ril.crash_handling_mode=1 persist.vendor.ril.crash_handling_mode=1
else else
@ -586,7 +586,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
# default usb debug functions # default usb debug functions
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.usb.usbradio.config=dm persist.vendor.usb.usbradio.config=dm
endif endif
@ -686,7 +686,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
ConnectivityOverlay ConnectivityOverlay
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
f2fs_io \ f2fs_io \
check_f2fs \ check_f2fs \
f2fs.fibmap \ f2fs.fibmap \
@ -714,7 +714,7 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include device/google/gs-common/dauntless/gsc.mk include device/google/gs-common/dauntless/gsc.mk
endif endif
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
WvInstallKeybox WvInstallKeybox
# Copy Camera HFD Setfiles # Copy Camera HFD Setfiles
@ -760,7 +760,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
debug.slsi_platform=1 \ debug.slsi_platform=1 \
debug.hwc.winupdate=1 debug.hwc.winupdate=1
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += displaycolor_service PRODUCT_PACKAGES += displaycolor_service
endif endif
@ -842,7 +842,7 @@ PRODUCT_PACKAGES += wpa_supplicant.conf
WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled 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 += wpa_cli
PRODUCT_PACKAGES += hostapd_cli PRODUCT_PACKAGES += hostapd_cli
endif endif
@ -910,7 +910,7 @@ $(call inherit-product, system/core/trusty/trusty-storage.mk)
$(call inherit-product, system/core/trusty/trusty-base.mk) $(call inherit-product, system/core/trusty/trusty-base.mk)
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
trusty-ut-ctrl \ trusty-ut-ctrl \
tipc-test \ tipc-test \
trusty_stats_test \ trusty_stats_test \
@ -936,7 +936,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.frp.pst=/dev/block/by-name/frp ro.frp.pst=/dev/block/by-name/frp
# System props to enable Bluetooth Quality Report (BQR) feature # 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 += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.event_mask?=262174 \ persist.bluetooth.bqr.event_mask?=262174 \
persist.bluetooth.bqr.min_interval_ms=500 persist.bluetooth.bqr.min_interval_ms=500
@ -976,8 +976,8 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
Iwlan Iwlan
#Iwlan test app for userdebug/eng builds #Iwlan test app for eng builds
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
IwlanTestApp IwlanTestApp
endif endif
@ -1032,7 +1032,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \
# Vibrator Diag # Vibrator Diag
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
diag-vibrator \ diag-vibrator \
diag-vibrator-cs40l25a \ diag-vibrator-cs40l25a \
diag-vibrator-drv2624 \ diag-vibrator-drv2624 \
@ -1081,7 +1081,7 @@ PRODUCT_PACKAGES += vndservicemanager
PRODUCT_PACKAGES += vndservice PRODUCT_PACKAGES += vndservice
## TinyTools, debug tool and cs35l41 speaker calibration tool for Audio ## 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 += \ PRODUCT_PACKAGES += \
tinyplay \ tinyplay \
tinycap \ tinycap \
@ -1175,7 +1175,7 @@ USES_RADIOEXT_V1_7 = true
include hardware/google/pixel/wifi_ext/device.mk include hardware/google/pixel/wifi_ext/device.mk
# Battery Stats Viewer # Battery Stats Viewer
PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer PRODUCT_PACKAGES_ENG += BatteryStatsViewer
# Install product specific framework compatibility matrix # Install product specific framework compatibility matrix
# (TODO: b/169535506) This includes the FCM for system_ext and product partition. # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
@ -1198,7 +1198,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
include hardware/google/pixel/HardwareInfo/HardwareInfo.mk include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
# UFS: the script is used to select the corresponding firmware to run FFU. # UFS: the script is used to select the corresponding firmware to run FFU.
PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh PRODUCT_PACKAGES_ENG += ufs_firmware_update.sh
ifneq ($(BOARD_WITHOUT_RADIO),true) ifneq ($(BOARD_WITHOUT_RADIO),true)
# RIL extension service # RIL extension service

2
dumpstate/item.mk
View file

@ -1,4 +1,4 @@
PRODUCT_PACKAGES += dump_power PRODUCT_PACKAGES += dump_power
PRODUCT_PACKAGES_DEBUG += dump_gsa.sh PRODUCT_PACKAGES_ENG += dump_gsa.sh