akita: 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 25d8a2b995
commit eff056c3fa
No known key found for this signature in database
GPG key ID: CC95044519BE6669
4 changed files with 9 additions and 9 deletions

View file

@ -43,7 +43,7 @@ include device/google/zuma/BoardConfig-common.mk
include device/google/akita/sepolicy/akita-sepolicy.mk include device/google/akita/sepolicy/akita-sepolicy.mk
include device/google/akita/wifi/BoardConfig-wifi.mk include device/google/akita/wifi/BoardConfig-wifi.mk
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/5_15/BoardUserdebugModules.mk -include device/google/common/etm/5_15/BoardUserdebugModules.mk
endif endif

View file

@ -55,7 +55,7 @@ PRODUCT_COPY_FILES += \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \ device/google/akita/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

View file

@ -174,15 +174,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
# Bluetooth AAC VBR # Bluetooth AAC VBR
@ -246,7 +246,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
ro.support_one_handed_mode=true ro.support_one_handed_mode=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 \
@ -357,7 +357,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.auto_exposure_compensation_supported=true persist.vendor.udfps.auto_exposure_compensation_supported=true
# Fingerprint Auth Filter # Fingerprint Auth Filter
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.auth_filter.log_all_coverages=true \ persist.vendor.udfps.auth_filter.log_all_coverages=true \
persist.vendor.udfps.auth_filter.data_collection_enabled=false persist.vendor.udfps.auth_filter.data_collection_enabled=false
@ -408,6 +408,6 @@ PRODUCT_SYSTEM_PROPERTIES += \
persist.settings.large_screen_opt.enabled=false persist.settings.large_screen_opt.enabled=false
# 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

View file

@ -15,7 +15,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
device/google/akita/location/gnssd device/google/akita/location/gnssd
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/akita/location/gnssd/release/gps.cfg:vendor/etc/gnss/gps.cfg device/google/akita/location/gnssd/release/gps.cfg:vendor/etc/gnss/gps.cfg
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \