From 886674a976b9b7dca4f3d6f453197cfc9e3a7201 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Wed, 28 Nov 2018 20:41:20 -0800
Subject: [PATCH] comet: Disable userdebug diagnostics

* We can't make use of most of the debug features on userdebug builds.

Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f
---
 audio/comet/audio-tables.mk |  4 ++--
 comet/BoardConfig.mk        |  2 +-
 device-comet.mk             | 12 ++++++------
 location/Android.bp         |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/audio/comet/audio-tables.mk b/audio/comet/audio-tables.mk
index 49123f8..1d15e80 100644
--- a/audio/comet/audio-tables.mk
+++ b/audio/comet/audio-tables.mk
@@ -67,8 +67,8 @@ PRODUCT_PACKAGES += \
     compens_spk_r_1.conf \
     compens_spk_r_2.conf
 
-# userdebug specific
-PRODUCT_PACKAGES_DEBUG += \
+# eng specific
+PRODUCT_PACKAGES_ENG += \
     BLUETOOTH.mods \
     HANDSFREE.mods \
     HANDSET.mods \
diff --git a/comet/BoardConfig.mk b/comet/BoardConfig.mk
index 492e034..908ce70 100644
--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -30,7 +30,7 @@ include device/google/zumapro/BoardConfig-common.mk
 include device/google/comet/sepolicy/comet-sepolicy.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
 endif
 
diff --git a/device-comet.mk b/device-comet.mk
index 26837e9..46f9a77 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -37,7 +37,7 @@ TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT
 
 LOCAL_PATH := device/google/comet
 
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
     USE_UWBFIELDTESTQM := true
 endif
 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_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 += \
 		$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json
 endif
@@ -208,15 +208,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.se_capability=1
 
 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     hci_inject
 
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     sar_test
 
 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_DEBUG += \
+PRODUCT_PACKAGES_ENG += \
     ewp_tool
 
 # Bluetotoh Auto On feature
@@ -468,7 +468,7 @@ PRODUCT_COPY_FILES += \
 SUPPORT_RIL_DOMAIN_SELECTION := true
 
 # 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)
 endif
 
diff --git a/location/Android.bp b/location/Android.bp
index f173985..b5d18bd 100644
--- a/location/Android.bp
+++ b/location/Android.bp
@@ -33,7 +33,7 @@ gnss_prebuilt_etc {
                 src: "user/gps.cfg",
             },
             userdebug: {
-                src: "userdebug/gps.cfg",
+                src: "user/gps.cfg",
             },
             eng: {
                 src: "userdebug/gps.cfg",