From 65dca5de725e78230348cb757dcbdeb57c0fd4c6 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 28 Nov 2018 20:41:20 -0800 Subject: [PATCH] pantah: Disable userdebug diagnostics * We can't make use of most of the debug features on userdebug builds. Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f --- audio/cheetah/audio-tables.mk | 4 ++-- audio/panther/audio-tables.mk | 4 ++-- device-cheetah.mk | 14 +++++++------- device-cloudripper.mk | 2 +- device-panther.mk | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index 1f74dcf..66698dd 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -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 \ diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index 108b800..f3b0ff3 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -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 \ diff --git a/device-cheetah.mk b/device-cheetah.mk index 06adb3d..fd2e0d6 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -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 diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 723d350..747d708 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -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 \ diff --git a/device-panther.mk b/device-panther.mk index 88a2305..c3a17b7 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -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