From 8de98228d48ebb975c45d9b685f5b2e5c309c653 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 28 Nov 2018 20:41:20 -0800 Subject: [PATCH] bluejay: Disable userdebug diagnostics * We can't make use of most of the debug features on userdebug builds. Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f --- audio/bluejay/audio-tables.mk | 2 +- device-bluejay.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/audio/bluejay/audio-tables.mk b/audio/bluejay/audio-tables.mk index 07dec10..4fee846 100644 --- a/audio/bluejay/audio-tables.mk +++ b/audio/bluejay/audio-tables.mk @@ -51,7 +51,7 @@ PRODUCT_COPY_FILES += \ device/google/bluejay/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))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/bluejay/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \ device/google/bluejay/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \ diff --git a/device-bluejay.mk b/device-bluejay.mk index e7436d2..c7411f9 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -152,7 +152,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=0 # Bluetooth Hal Extension test tools -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ sar_test \ hci_inject @@ -225,7 +225,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true # GPS xml -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/bluejay/gps.xml.b3:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml else