pantah: 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 344623a9f8
commit 65dca5de72
No known key found for this signature in database
GPG key ID: CC95044519BE6669
5 changed files with 19 additions and 19 deletions

View file

@ -65,8 +65,8 @@ PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# eng specific
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

View file

@ -65,8 +65,8 @@ PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# eng specific
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia_stereo/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

View file

@ -157,7 +157,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
# Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
hci_inject
# Bluetooth OPUS codec
@ -175,7 +175,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
sar_test
PRODUCT_PRODUCT_PROPERTIES += \
@ -186,7 +186,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true
# 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 += \
persist.bluetooth.bqr.event_mask=262238
else
@ -229,7 +229,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
ewp_tool
# default BDADDR for EVB only
PRODUCT_PROPERTY_OVERRIDES += \
@ -301,7 +301,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
@ -351,8 +351,8 @@ PRODUCT_PACKAGES += \
SettingsOverlayGE2AE \
SettingsOverlayGP4BC
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# eng specific
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
endif

View file

@ -158,7 +158,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \

View file

@ -140,7 +140,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.server.automatic_turn_on=true
# Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
hci_inject
# Bluetooth OPUS codec
@ -158,7 +158,7 @@ PRODUCT_COPY_FILES += \
device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv
# Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
sar_test
# default BDADDR for EVB only
PRODUCT_PROPERTY_OVERRIDES += \
@ -199,7 +199,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.ble.allow_enc_with_bredr=true
# Bluetooth EWP test tool
PRODUCT_PACKAGES_DEBUG += \
PRODUCT_PACKAGES_ENG += \
ewp_tool
PRODUCT_PRODUCT_PROPERTIES += \
@ -210,7 +210,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.a2dp_aac.vbr_supported=true
# 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 += \
persist.bluetooth.bqr.event_mask=262238
else
@ -284,7 +284,7 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
@ -336,8 +336,8 @@ PRODUCT_PACKAGES += \
SettingsOverlayGVU6C \
SettingsOverlayGVU6C_VN
# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# eng specific
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \
device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
endif