sunfish: Remove userdebug/eng configuration
Change-Id: I8a37c788060a4aae5a7585ea8142a6fbfec8cba4
This commit is contained in:
Michael Bestas
File diff suppressed because one or more lines are too long
@@ -112,19 +112,6 @@ PRODUCT_COPY_FILES += \
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml
|
||||
|
||||
# Set the default property of tcpdump_logger on eng ROM.
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.tcpdump.log.alwayson=false \
|
||||
persist.vendor.tcpdump.log.br_num=5
|
||||
endif
|
||||
|
||||
# Disable Rescue Party on eng build
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PRODUCT_PROPERTIES += \
|
||||
persist.sys.disable_rescue=true
|
||||
endif
|
||||
|
||||
# Enable Incremental on the device via kernel module
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.incremental.enable=module:/vendor/lib/modules/incrementalfs.ko
|
||||
|
||||
@@ -78,10 +78,6 @@ PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/audio/cs35l41/EVT1.1/cs35l41-revB2-dsp1-spk-prot.wmfw:$(TARGET_COPY_OUT_VENDOR)/firmware/cs35l41-revB2-dsp1-spk-prot.wmfw \
|
||||
$(LOCAL_PATH)/audio/cs35l41/EVT1.1/R-cs35l41-revB2-dsp1-spk-prot.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/R-cs35l41-revB2-dsp1-spk-prot.bin \
|
||||
|
||||
# Audio CS35L41 speaker calibration tool
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
crus_sp_cal
|
||||
|
||||
# Audio effects
|
||||
PRODUCT_PACKAGES += \
|
||||
libqcomvoiceprocessingdescriptors
|
||||
@@ -98,12 +94,6 @@ PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/audio/acdbdata/Headset_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Headset_cal.acdb \
|
||||
$(LOCAL_PATH)/audio/acdbdata/Speaker_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Speaker_cal.acdb \
|
||||
$(LOCAL_PATH)/audio/acdbdata/adsp_avs_config.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/adsp_avs_config.acdb
|
||||
|
||||
# Audio ACDB workspace files for QACT
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/audio/acdbdata/workspaceFile.qwsp:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/workspaceFile.qwsp
|
||||
endif
|
||||
endif
|
||||
|
||||
# Settings overlay packages for regulatory_info
|
||||
|
||||
117
device.mk
117
device.mk
@@ -94,23 +94,10 @@ PRODUCT_PACKAGES += \
|
||||
MSM_VIDC_TARGET_LIST := sm6150 # Get the color format from kernel headers
|
||||
MASTER_SIDE_CP_TARGET_LIST := sm6150 # ION specific settings
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.diag.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).diag.rc
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.mpssrfs.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).mpssrfs.rc
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.diag.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).diag.rc
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.mpssrfs.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).mpssrfs.rc
|
||||
endif
|
||||
|
||||
# Enable DIAG issue debug
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.diagdebug.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.diagdebug.rc
|
||||
endif
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.diag.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).diag.rc
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/init.hardware.mpssrfs.rc.user:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.$(PRODUCT_PLATFORM).mpssrfs.rc
|
||||
|
||||
# A/B support
|
||||
PRODUCT_PACKAGES += \
|
||||
@@ -140,10 +127,6 @@ AB_OTA_POSTINSTALL_CONFIG += \
|
||||
PRODUCT_PACKAGES += \
|
||||
update_engine_sideload
|
||||
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
f2fs_io \
|
||||
check_f2fs
|
||||
|
||||
AB_OTA_POSTINSTALL_CONFIG += \
|
||||
RUN_POSTINSTALL_vendor=true \
|
||||
POSTINSTALL_PATH_vendor=bin/checkpoint_gc \
|
||||
@@ -157,12 +140,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
PRODUCT_PACKAGES += \
|
||||
checkpoint_gc
|
||||
|
||||
# The following modules are included in debuggable builds only.
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
bootctl \
|
||||
r.vendor \
|
||||
update_engine_client
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
|
||||
frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
|
||||
@@ -338,10 +315,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
PRODUCT_PACKAGES += \
|
||||
vendor.qti.hardware.memtrack-service
|
||||
|
||||
#Bluetooth SAR HAL
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
bluetooth_sar_test
|
||||
|
||||
# Bluetooth SoC
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
vendor.qcom.bluetooth.soc=cherokee
|
||||
@@ -407,13 +380,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.camera.provider@2.7-service-google
|
||||
|
||||
# Google Camera HAL test libraries in debug builds
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PACKAGES_DEBUG += \
|
||||
libgoogle_camera_hal_proprietary_tests \
|
||||
libgoogle_camera_hal_tests
|
||||
endif
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.sensors@2.0-service.multihal
|
||||
|
||||
@@ -425,13 +391,6 @@ PRODUCT_PACKAGES += \
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.contexthub-service.generic
|
||||
|
||||
# CHRE tools
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PACKAGES += \
|
||||
chre_power_test_client \
|
||||
chre_test_client
|
||||
endif
|
||||
|
||||
# Boot control HAL
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.boot-service.qti \
|
||||
@@ -475,19 +434,12 @@ ENABLE_VENDOR_RIL_SERVICE := true
|
||||
USE_QCRIL_OEMHOOK := true
|
||||
|
||||
HOSTAPD := hostapd
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
HOSTAPD += hostapd_cli
|
||||
endif
|
||||
PRODUCT_PACKAGES += $(HOSTAPD)
|
||||
|
||||
WPA := wpa_supplicant.conf
|
||||
WPA += wpa_supplicant
|
||||
PRODUCT_PACKAGES += $(WPA)
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PACKAGES += wpa_cli
|
||||
endif
|
||||
|
||||
# Wifi
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.wifi-service \
|
||||
@@ -522,27 +474,6 @@ PRODUCT_PACKAGES += \
|
||||
android.hardware.bluetooth.audio@2.0-impl \
|
||||
android.hardware.audio.service
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PACKAGES += \
|
||||
tinyplay \
|
||||
tinycap \
|
||||
tinymix \
|
||||
tinypcminfo \
|
||||
cplay
|
||||
endif
|
||||
|
||||
# Audio hal xmls
|
||||
|
||||
# Audio Policy tables
|
||||
|
||||
# Audio ACDB data
|
||||
|
||||
# Audio ACDB workspace files for QACT
|
||||
|
||||
# Audio speaker tunning config data
|
||||
|
||||
# Audio audiozoom config data
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
|
||||
$(LOCAL_PATH)/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
|
||||
@@ -551,24 +482,10 @@ PRODUCT_COPY_FILES += \
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
vendor.audio.snd_card.open.retries=50
|
||||
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
# Subsystem ramdump
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.sys.ssr.enable_ramdumps=1
|
||||
endif
|
||||
|
||||
# Subsystem silent restart
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.sys.ssr.restart_level=modem,adsp,slpi
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
# Sensor debug flag
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.debug.ash.logger=0 \
|
||||
persist.vendor.debug.ash.logger.time=0
|
||||
endif
|
||||
|
||||
# setup dalvik vm configs
|
||||
$(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
|
||||
|
||||
@@ -576,16 +493,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk)
|
||||
PRODUCT_PACKAGES += \
|
||||
charger_res_images
|
||||
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
# b/36703476: Set default log size to 1M
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.logd.size=1M
|
||||
# b/114766334: persist all logs by default rotating on 30 files of 1MiB
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
logd.logpersistd=logcatd \
|
||||
logd.logpersistd.size=30
|
||||
endif
|
||||
|
||||
# Dumpstate HAL
|
||||
PRODUCT_PACKAGES += \
|
||||
android.hardware.dumpstate@1.1-service.sunfish
|
||||
@@ -631,13 +538,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.vendor.radio.log_prefix="modem_log_"
|
||||
|
||||
# Enable modem logging for debug
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.sys.modem.diag.mdlog=true
|
||||
else
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.sys.modem.diag.mdlog=false
|
||||
endif
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.sys.modem.diag.mdlog_br_num=5
|
||||
|
||||
@@ -652,12 +554,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||
# Enable stats logging in LMKD
|
||||
TARGET_LMKD_STATS_LOG := true
|
||||
|
||||
# default usb oem functions
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.usb.usbradio.config=diag
|
||||
endif
|
||||
|
||||
# Enable app/sf phase offset as durations. The numbers below are translated from the existing
|
||||
# positive offsets by finding the duration app/sf will have with the offsets.
|
||||
# For SF the previous value was 6ms which under 16.6ms vsync time (60Hz) will leave SF with ~10.5ms
|
||||
@@ -747,13 +643,8 @@ PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
|
||||
|
||||
# Vendor verbose logging default property
|
||||
ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.verbose_logging_enabled=true
|
||||
else
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
persist.vendor.verbose_logging_enabled=false
|
||||
endif
|
||||
|
||||
-include vendor/qcom/sm8150/proprietary/commonsys-intf/data/data_commonsys-intf_system_product.mk
|
||||
-include vendor/qcom/sm8150/proprietary/commonsys-intf/data/data_commonsys-intf_vendor_product.mk
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2020 The Android Open-Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
# Trigger ramdump when property on
|
||||
on property:vendor.radio.diag_debug=true
|
||||
write /dev/kmsg "RIL Diag Issue Detected!"
|
||||
write /proc/sysrq-trigger "c"
|
||||
@@ -1,108 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2018 The Android Open-Source Project
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
on init
|
||||
chmod 666 /dev/diag
|
||||
|
||||
on post-fs-data
|
||||
# Modem logging collection
|
||||
mkdir /data/vendor/radio 0777 radio radio
|
||||
mkdir /data/vendor/radio/diag_logs 0777 system system
|
||||
rm /data/vendor/radio/diag_logs/logs/diag_poweron_log.qmdl
|
||||
# WLAN logging collection
|
||||
mkdir /data/vendor/wifi 0777 system system
|
||||
mkdir /data/vendor/wifi/cnss_diag 0777 system system
|
||||
|
||||
service diag_mdlog_start /vendor/bin/diag_mdlog
|
||||
class late_start
|
||||
user shell
|
||||
group system diag media_rw
|
||||
socket diag_router stream 0666 system system
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
service diag_mdlog_stop /vendor/bin/diag_mdlog -k
|
||||
class late_start
|
||||
user shell
|
||||
group system diag media_rw
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
on boot && property:persist.vendor.sys.modem.diag.mdlog=*
|
||||
rm /data/vendor/radio/diag_logs/diag_mdlog_pid
|
||||
setprop vendor.sys.modem.diag.mdlog ${persist.vendor.sys.modem.diag.mdlog}
|
||||
|
||||
on property:vendor.sys.modem.diag.mdlog=true && property:persist.vendor.verbose_logging_enabled=true
|
||||
start diag_mdlog_start
|
||||
|
||||
on property:vendor.sys.modem.diag.mdlog=false
|
||||
start diag_mdlog_stop
|
||||
|
||||
on property:persist.vendor.sys.cnss.diag_qxdm=true
|
||||
start vendor.cnss_diag
|
||||
|
||||
on property:persist.vendor.sys.cnss.diag_qxdm=false
|
||||
stop vendor.cnss_diag
|
||||
|
||||
on property:persist.vendor.sys.cnss.diag_txt=true
|
||||
start vendor.cnss_diag_txt
|
||||
|
||||
on property:persist.vendor.sys.cnss.diag_txt=false
|
||||
stop vendor.cnss_diag_txt
|
||||
|
||||
service vendor.cnss_diag /vendor/bin/cnss_diag -q -u -w
|
||||
class late_start
|
||||
user system
|
||||
group system
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
service vendor.cnss_diag_txt /vendor/bin/cnss_diag -s -f -P -m /data/vendor/wifi/cnss_diag/cnss_diag.conf -t HELIUM
|
||||
class late_start
|
||||
user system
|
||||
group system
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
on property:vendor.debug.ramdump.force_crash=true
|
||||
write /proc/sysrq-trigger "c"
|
||||
|
||||
on property:ro.vendor.bluetooth.ftm_enabled=true
|
||||
start ftmd
|
||||
|
||||
service ftmd /vendor/bin/ftmdaemon
|
||||
class late_start
|
||||
user root
|
||||
group bluetooth net_bt_admin misc diag net_bt
|
||||
disabled
|
||||
oneshot
|
||||
|
||||
on property:vendor.sys.logger.bluetooth=true
|
||||
setprop persist.vendor.service.bdroid.snooplog true
|
||||
setprop persist.vendor.service.bdroid.fwsnoop true
|
||||
|
||||
on property:vendor.sys.logger.bluetooth=false
|
||||
setprop persist.vendor.service.bdroid.snooplog false
|
||||
setprop persist.vendor.service.bdroid.fwsnoop false
|
||||
|
||||
on property:persist.bluetooth.btsnoopenable=true
|
||||
setprop persist.vendor.service.bdroid.soclog true
|
||||
|
||||
on property:persist.bluetooth.btsnoopenable=false
|
||||
setprop persist.vendor.service.bdroid.soclog false
|
||||
|
||||
on property:vendor.usb.config=*
|
||||
start usbd
|
||||
@@ -1,11 +0,0 @@
|
||||
on post-fs-data
|
||||
# Modem Remote FS
|
||||
mkdir /data/vendor/rfs 0770 vendor_rfs vendor_rfs
|
||||
mkdir /data/vendor/rfs/mpss 0770 vendor_rfs vendor_rfs
|
||||
mkdir /data/vendor/tombstones/rfs 0770 vendor_rfs vendor_rfs
|
||||
write /data/vendor/rfs/mpss/mcfg_nv_list_flag "1"
|
||||
chown vendor_rfs vendor_rfs /data/vendor/rfs/mpss/mcfg_nv_list_flag
|
||||
chmod 0700 /data/vendor/rfs/mpss/mcfg_nv_list_flag
|
||||
|
||||
on property:vendor.sys.modem.diag.efsdump=true
|
||||
chmod 0660 /data/vendor/rfs/mpss/modem_efs
|
||||
Reference in New Issue
Block a user