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

comet: 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 4c03616795
commit 886674a976
No known key found for this signature in database
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/comet/audio-tables.mk
View file

@ -67,8 +67,8 @@ PRODUCT_PACKAGES += \
compens_spk_r_1.conf \ compens_spk_r_1.conf \
compens_spk_r_2.conf compens_spk_r_2.conf
# userdebug specific # eng specific
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
BLUETOOTH.mods \ BLUETOOTH.mods \
HANDSFREE.mods \ HANDSFREE.mods \
HANDSET.mods \ HANDSET.mods \

2
comet/BoardConfig.mk
View file

@ -30,7 +30,7 @@ include device/google/zumapro/BoardConfig-common.mk
include device/google/comet/sepolicy/comet-sepolicy.mk include device/google/comet/sepolicy/comet-sepolicy.mk
include device/google/comet/wifi/BoardConfig-wifi.mk include device/google/comet/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-comet.mk
View file

@ -37,7 +37,7 @@ TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
LOCAL_PATH := device/google/comet LOCAL_PATH := device/google/comet
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif endif
ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),) ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
@ -174,7 +174,7 @@ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json
endif endif
@ -208,15 +208,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.gms.dck.se_capability=1 ro.gms.dck.se_capability=1
# Bluetooth hci_inject test tool # Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
hci_inject hci_inject
# 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
# Bluetotoh Auto On feature # Bluetotoh Auto On feature
@ -468,7 +468,7 @@ PRODUCT_COPY_FILES += \
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
location/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",