From 27228265e71b89c5735ec62c0afdbf0e2872fea5 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 28 Nov 2018 20:41:20 -0800 Subject: [PATCH] raviole: Disable userdebug diagnostics * We can't make use of most of the debug features on userdebug builds. Change-Id: I31df2090b31243b742c4e82dc08cd8491dada54f --- audio/oriole/audio-tables.mk | 2 +- audio/raven/audio-tables.mk | 2 +- conf/init.raviole.rc | 8 ++++---- device-oriole.mk | 8 ++++---- device-raven.mk | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index 8d15bf9..9882d28 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -53,7 +53,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \ diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index 11e20b1..0cf1b8c 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -53,7 +53,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/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/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \ diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index a09cbae..6c45140 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -14,21 +14,21 @@ on early-boot start insmod_sh_raviole # Disables fingerprint antispoof on PROTO1.0 devices -on boot && property:ro.build.type=userdebug && \ +on boot && property:ro.build.type=eng && \ property:ro.revision=PROTO1.0 && \ property:persist.vendor.fingerprint.disable.fake.override=none setprop vendor.fingerprint.disable.fake 100 # Overrides fingerprint antispoof if following persist sysprops are set -on boot && property:ro.build.type=userdebug && \ +on boot && property:ro.build.type=eng && \ property:persist.vendor.fingerprint.disable.fake.override=0 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -on boot && property:ro.build.type=userdebug && \ +on boot && property:ro.build.type=eng && \ property:persist.vendor.fingerprint.disable.fake.override=1 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -on boot && property:ro.build.type=userdebug && \ +on boot && property:ro.build.type=eng && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} diff --git a/device-oriole.mk b/device-oriole.mk index 9bae8bb..6d70162 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -96,12 +96,12 @@ PRODUCT_COPY_FILES += \ # Bluetooth Hal Extension test tools -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ sar_test \ hci_inject # userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) # Bluetooth LE Audio Hardware offload PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ @@ -187,7 +187,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31 # userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif @@ -287,7 +287,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true # Location -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml else diff --git a/device-raven.mk b/device-raven.mk index 3a20a6f..e85c17a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -108,12 +108,12 @@ PRODUCT_COPY_FILES += \ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # Bluetooth Hal Extension test tools -PRODUCT_PACKAGES_DEBUG += \ +PRODUCT_PACKAGES_ENG += \ sar_test \ hci_inject # userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) # Bluetooth LE Audio Hardware offload PRODUCT_PRODUCT_PROPERTIES += \ ro.bluetooth.leaudio_offload.supported=true \ @@ -191,7 +191,7 @@ PRODUCT_SOONG_NAMESPACES += \ # userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif @@ -298,7 +298,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true # Location -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml else