Disable userdebug diagnostics

* 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 5a322be262
commit 7e2cd8f092
4 changed files with 35 additions and 24 deletions

View File

@@ -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_tunning_keys,true)

View File

@@ -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
@@ -641,8 +640,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
@@ -872,8 +871,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

View File

@@ -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

View File

@@ -83,7 +83,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
@@ -102,7 +102,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
@@ -323,7 +323,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
endif
@@ -361,7 +361,7 @@ PRODUCT_PACKAGES += \
android.hardware.contexthub-service.generic
# CHRE tools
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES += \
chre_power_test_client \
chre_test_client
@@ -391,7 +391,7 @@ PRODUCT_PACKAGES += \
checkpoint_gc
# Vendor verbose logging default property
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.verbose_logging_enabled=true
else
@@ -447,7 +447,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
@@ -571,11 +571,13 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
ConnectivityOverlay
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
f2fs_io \
check_f2fs \
f2fs.fibmap \
dump.f2fs
endif
# Storage dump
include device/google/gs-common/storage/storage.mk
@@ -603,8 +605,10 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include device/google/gs-common/dauntless/gsc.mk
endif
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
WvInstallKeybox
endif
# Copy Camera HFD Setfiles
#PRODUCT_COPY_FILES += \
@@ -662,7 +666,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
@@ -737,7 +741,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
@@ -820,10 +824,12 @@ $(call inherit-product, system/core/trusty/trusty-base.mk)
include device/google/gs-common/trusty/trusty.mk
# Trusty unit test tool
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
trusty-ut-ctrl \
tipc-test \
trusty_stats_test \
trusty_stats_test
endif
include device/google/gs101/confirmationui/confirmationui.mk
@@ -848,7 +854,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
@@ -892,8 +898,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
@@ -917,9 +923,11 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
PRODUCT_PACKAGES += ShannonIms
#RCS Test Messaging App
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
preinstalled-packages-product-gs201-device-debug.xml \
TestRcsApp
endif
PRODUCT_PACKAGES += ShannonRcs
endif
@@ -965,7 +973,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
@@ -1014,11 +1022,13 @@ PRODUCT_COPY_FILES += \
ARM_COMPUTE_CL_ENABLE := 1
# Vibrator Diag
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += \
diag-vibrator \
diag-vibrator-cs40l25a \
diag-vibrator-drv2624 \
$(NULL)
endif
PRODUCT_PACKAGES += \
android.hardware.health-service.gs201 \
@@ -1057,7 +1067,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 \
@@ -1147,7 +1157,9 @@ USES_RADIOEXT_V1_5 = true
include hardware/google/pixel/wifi_ext/device.mk
# Battery Stats Viewer
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
endif
PRODUCT_PACKAGES += dump_power_gs201.sh
# Install product specific framework compatibility matrix