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

caimito: 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 619868feb7
commit ebfe176ee0
No known key found for this signature in database
14 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
audio/caiman/audio-tables.mk
View file

@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
compens_spk_r.conf \ compens_spk_r.conf \
default_mic_compensation.bin default_mic_compensation.bin
# userdebug and eng specific # eng specific
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
BLUETOOTH.mods \ BLUETOOTH.mods \
HANDSFREE.mods \ HANDSFREE.mods \
HANDSET.mods \ HANDSET.mods \
@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
test_config.ini \ test_config.ini \
test_preset.mps test_preset.mps
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml

6
audio/komodo/audio-tables.mk
View file

@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
compens_spk_r.conf \ compens_spk_r.conf \
default_mic_compensation.bin default_mic_compensation.bin
# userdebug and eng specific # eng specific
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
BLUETOOTH.mods \ BLUETOOTH.mods \
HANDSFREE.mods \ HANDSFREE.mods \
HANDSET.mods \ HANDSET.mods \
@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
test_config.ini \ test_config.ini \
test_preset.mps test_preset.mps
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml

6
audio/tokay/audio-tables.mk
View file

@ -64,8 +64,8 @@ PRODUCT_PACKAGES += \
compens_spk_r.conf \ compens_spk_r.conf \
default_mic_compensation.bin default_mic_compensation.bin
# userdebug and eng specific # eng specific
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
BLUETOOTH.mods \ BLUETOOTH.mods \
HANDSFREE.mods \ HANDSFREE.mods \
HANDSET.mods \ HANDSET.mods \
@ -75,7 +75,7 @@ PRODUCT_PACKAGES_DEBUG += \
test_config.ini \ test_config.ini \
test_preset.mps test_preset.mps
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal # Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml

2
caiman/BoardConfig.mk
View file

@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/caimito/sepolicy/caiman-sepolicy.mk include device/google/caimito/sepolicy/caiman-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk -include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif endif

12
device-caiman.mk
View file

@ -34,7 +34,7 @@ endif
LOCAL_PATH := device/google/caimito LOCAL_PATH := device/google/caimito
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif endif
ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),) ifeq ($(filter factory_caiman, $(TARGET_PRODUCT)),)
@ -184,7 +184,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false persist.vendor.audio.cca.enabled=false
# Bluetooth hci_inject test tool # Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
hci_inject hci_inject
# Bluetooth OPUS codec # Bluetooth OPUS codec
@ -192,11 +192,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true
# Bluetooth SAR test tool # Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sar_test sar_test
# Bluetooth EWP test tool # Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
ewp_tool ewp_tool
# Bluetooth AAC VBR # Bluetooth AAC VBR
@ -208,7 +208,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.hfp.swb.supported=true bluetooth.hfp.swb.supported=true
# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.event_mask=295006 \
persist.bluetooth.bqr.vnd_quality_mask=29 \ persist.bluetooth.bqr.vnd_quality_mask=29 \
@ -419,7 +419,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
SUPPORT_RIL_DOMAIN_SELECTION := true SUPPORT_RIL_DOMAIN_SELECTION := true
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif endif

2
device-caimito-common.mk
View file

@ -29,7 +29,7 @@ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_prediction_lstm_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_prediction_lstm_model.tflite
ifneq (,$(filter $(TARGET_BUILD_VARIANT), userdebug eng)) ifneq (,$(filter $(TARGET_BUILD_VARIANT), eng))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json
endif endif

12
device-komodo.mk
View file

@ -34,7 +34,7 @@ endif
LOCAL_PATH := device/google/caimito LOCAL_PATH := device/google/caimito
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif endif
ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),) ifeq ($(filter factory_komodo, $(TARGET_PRODUCT)),)
@ -199,7 +199,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false persist.vendor.audio.cca.enabled=false
# Bluetooth hci_inject test tool # Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
hci_inject hci_inject
# Bluetooth OPUS codec # Bluetooth OPUS codec
@ -207,11 +207,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true
# Bluetooth SAR test tool # Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sar_test sar_test
# Bluetooth EWP test tool # Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
ewp_tool ewp_tool
# Bluetooth AAC VBR # Bluetooth AAC VBR
@ -223,7 +223,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.hfp.swb.supported=true bluetooth.hfp.swb.supported=true
# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.event_mask=295006 \
persist.bluetooth.bqr.vnd_quality_mask=29 \ persist.bluetooth.bqr.vnd_quality_mask=29 \
@ -427,7 +427,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif endif

10
device-tokay.mk
View file

@ -177,7 +177,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false persist.vendor.audio.cca.enabled=false
# Bluetooth hci_inject test tool # Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
hci_inject hci_inject
# Bluetooth OPUS codec # Bluetooth OPUS codec
@ -185,11 +185,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true
# Bluetooth SAR test tool # Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sar_test sar_test
# Bluetooth EWP test tool # Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
ewp_tool ewp_tool
# Bluetooth AAC VBR # Bluetooth AAC VBR
@ -201,7 +201,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.hfp.swb.supported=true bluetooth.hfp.swb.supported=true
# Override BQR mask to enable LE Audio Choppy report, remove BTRT logging # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.bqr.event_mask=295006 \ persist.bluetooth.bqr.event_mask=295006 \
persist.bluetooth.bqr.vnd_quality_mask=29 \ persist.bluetooth.bqr.vnd_quality_mask=29 \
@ -398,7 +398,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
# ETM # ETM
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
endif endif

2
fingerprint/ultrasonic_udfps.mk
View file

@ -32,7 +32,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.qfp.enable_setprop=0 \ persist.vendor.qfp.enable_setprop=0 \
log.tag.QFP=3 log.tag.QFP=3
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/fingerprint/QFPCalibration vendor/qcom/fingerprint/QFPCalibration

2
komodo/BoardConfig.mk
View file

@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/caimito/sepolicy/komodo-sepolicy.mk include device/google/caimito/sepolicy/komodo-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk -include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif endif

2
location/caiman/Android.bp
View file

@ -33,7 +33,7 @@ gnss_prebuilt_etc {
src: "user/gps.cfg", src: "user/gps.cfg",
}, },
userdebug: { userdebug: {
src: "userdebug/gps.cfg", src: "user/gps.cfg",
}, },
eng: { eng: {
src: "userdebug/gps.cfg", src: "userdebug/gps.cfg",

2
location/komodo/Android.bp
View file

@ -33,7 +33,7 @@ gnss_prebuilt_etc {
src: "user/gps.cfg", src: "user/gps.cfg",
}, },
userdebug: { userdebug: {
src: "userdebug/gps.cfg", src: "user/gps.cfg",
}, },
eng: { eng: {
src: "userdebug/gps.cfg", src: "userdebug/gps.cfg",

2
location/tokay/Android.bp
View file

@ -33,7 +33,7 @@ gnss_prebuilt_etc {
src: "user/gps.cfg", src: "user/gps.cfg",
}, },
userdebug: { userdebug: {
src: "userdebug/gps.cfg", src: "user/gps.cfg",
}, },
eng: { eng: {
src: "userdebug/gps.cfg", src: "userdebug/gps.cfg",

2
tokay/BoardConfig.mk
View file

@ -28,7 +28,7 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/caimito/sepolicy/tokay-sepolicy.mk include device/google/caimito/sepolicy/tokay-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk -include device/google/common/etm/6_1/BoardUserdebugModules.mk
endif endif