raviole: 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 9085fac186
commit 27228265e7
No known key found for this signature in database
GPG key ID: CC95044519BE6669
5 changed files with 14 additions and 14 deletions

View file

@ -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 device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ 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/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 \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

View file

@ -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 device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ 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/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 \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \

View file

@ -14,21 +14,21 @@ on early-boot
start insmod_sh_raviole start insmod_sh_raviole
# Disables fingerprint antispoof on PROTO1.0 devices # 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:ro.revision=PROTO1.0 && \
property:persist.vendor.fingerprint.disable.fake.override=none property:persist.vendor.fingerprint.disable.fake.override=none
setprop vendor.fingerprint.disable.fake 100 setprop vendor.fingerprint.disable.fake 100
# Overrides fingerprint antispoof if following persist sysprops are set # 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 property:persist.vendor.fingerprint.disable.fake.override=0
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} 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 property:persist.vendor.fingerprint.disable.fake.override=1
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} 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 property:persist.vendor.fingerprint.disable.fake.override=100
setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override}

View file

@ -96,12 +96,12 @@ PRODUCT_COPY_FILES += \
# Bluetooth Hal Extension test tools # Bluetooth Hal Extension test tools
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sar_test \ sar_test \
hci_inject hci_inject
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# Bluetooth LE Audio Hardware offload # Bluetooth LE Audio Hardware offload
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.leaudio_offload.supported=true \ 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 PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=31
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
endif endif
@ -287,7 +287,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true
# Location # Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
else else

View file

@ -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 device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf
# Bluetooth Hal Extension test tools # Bluetooth Hal Extension test tools
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_ENG += \
sar_test \ sar_test \
hci_inject hci_inject
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
# Bluetooth LE Audio Hardware offload # Bluetooth LE Audio Hardware offload
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.leaudio_offload.supported=true \ ro.bluetooth.leaudio_offload.supported=true \
@ -191,7 +191,7 @@ PRODUCT_SOONG_NAMESPACES += \
# userdebug specific # userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc device/google/gs101/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
endif endif
@ -298,7 +298,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.opus.enabled=true persist.bluetooth.opus.enabled=true
# Location # Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
else else