diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ccb0e0b..644a3a6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -47,24 +47,8 @@ ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) BOARD_KERNEL_CMDLINE += kasan=off endif -# Enable a limited subset of MTE for "normal" (non-_fullmte) eng builds. -# Don't touch any settings for _fullmte builds. They are set somewhere else. -ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) -ifeq ($(TARGET_BUILD_VARIANT),eng) -BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON -ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) -SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap) -endif -endif -endif - BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs -# Enable KUnit for eng builds -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) - BOARD_KERNEL_CMDLINE += kunit.enable=1 -endif - TARGET_NO_BOOTLOADER := true TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) @@ -266,13 +250,6 @@ BOARD_USES_GENERIC_AUDIO := true $(call soong_config_set,aoc_audio_func,ext_hidl,true) -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -$(call soong_config_set,aoc_audio_func,dump_usecase_data,true) -$(call soong_config_set,aoc_audio_func,hal_socket_control,true) -$(call soong_config_set,aoc_audio_func,record_tuning_keys,true) -$(call soong_config_set,aoc_audio_func,aidl_command_interface,true) -endif - ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) $(call soong_config_set,aoc_audio_func,aosp_build,true) endif diff --git a/conf/init.debug.rc b/conf/init.debug.rc deleted file mode 100644 index 9b536b4..0000000 --- a/conf/init.debug.rc +++ /dev/null @@ -1,61 +0,0 @@ -# SJTAG -on init - chown system system /sys/devices/platform/sjtag_ap/interface/access_lvl - chown system system /sys/devices/platform/sjtag_ap/interface/auth - chown system system /sys/devices/platform/sjtag_ap/interface/begin - chown system system /sys/devices/platform/sjtag_ap/interface/dbg_domain - chown system system /sys/devices/platform/sjtag_ap/interface/dbg_itvl - chown system system /sys/devices/platform/sjtag_ap/interface/end - chown system system /sys/devices/platform/sjtag_ap/interface/pubkey - chown system system /sys/devices/platform/sjtag_gsa/interface/access_lvl - chown system system /sys/devices/platform/sjtag_gsa/interface/auth - chown system system /sys/devices/platform/sjtag_gsa/interface/begin - chown system system /sys/devices/platform/sjtag_gsa/interface/dbg_domain - chown system system /sys/devices/platform/sjtag_gsa/interface/dbg_itvl - chown system system /sys/devices/platform/sjtag_gsa/interface/end - chown system system /sys/devices/platform/sjtag_gsa/interface/pubkey - - # HSUM separated main user from the SYSTEM user, granting write permissions - # for write only SJTAG sysfs files - chmod 220 /sys/devices/platform/sjtag_ap/interface/auth - chmod 220 /sys/devices/platform/sjtag_ap/interface/begin - chmod 220 /sys/devices/platform/sjtag_ap/interface/end - chmod 220 /sys/devices/platform/sjtag_gsa/interface/auth - chmod 220 /sys/devices/platform/sjtag_gsa/interface/begin - chmod 220 /sys/devices/platform/sjtag_gsa/interface/end - -on property:vendor.debug.ramdump.force_crash=true - write /sys/kernel/pixel_debug/trigger "null" - -on property:power.battery_input.suspended=true - write /sys/kernel/debug/google_charger/input_suspend 1 - -on property:power.battery_input.suspended=false - write /sys/kernel/debug/google_charger/input_suspend 0 - -# Bluetooth -on post-fs-data - chown bluetooth system /dev/logbuffer_btlpm - chown bluetooth system /dev/logbuffer_tty18 - -# pKVM performance is different on A0 and B0 chips. -# Add extra tag to metrics collected on A0 to separate the results. -on property:ro.revision=PROTO1.0 - setprop debug.hypervisor.metrics_tag "hwrev_a0" -on property:ro.revision=PROTO1.1 - setprop debug.hypervisor.metrics_tag "hwrev_a0" -on property:ro.revision=EVT1.0 - setprop debug.hypervisor.metrics_tag "hwrev_a0" - -# A0 chips require pKVM for a hardware issue workaround. Set pKVM to 'enabled' -# in /misc partition on first boot to signal to tests that this device should -# not be booted with pKVM disabled. -service vendor.force_pkvm /vendor/bin/misc_writer --set-enable-pkvm - disabled - oneshot -on property:persist.sys.device_provisioned=1 && property:ro.revision=PROTO1.0 - start vendor.force_pkvm -on property:persist.sys.device_provisioned=1 && property:ro.revision=PROTO1.1 - start vendor.force_pkvm -on property:persist.sys.device_provisioned=1 && property:ro.revision=EVT1.0 - start vendor.force_pkvm diff --git a/conf/init.eng.memtag.rc b/conf/init.eng.memtag.rc deleted file mode 100644 index e0e13f0..0000000 --- a/conf/init.eng.memtag.rc +++ /dev/null @@ -1,14 +0,0 @@ -# MTE in -eng build: all cores in Sync mode -on init - # Per-core mode overrides. - # Little Cores: sync - write /sys/devices/system/cpu/cpu0/mte_tcf_preferred sync - write /sys/devices/system/cpu/cpu1/mte_tcf_preferred sync - write /sys/devices/system/cpu/cpu2/mte_tcf_preferred sync - write /sys/devices/system/cpu/cpu3/mte_tcf_preferred sync - # Mid Cores: sync - write /sys/devices/system/cpu/cpu4/mte_tcf_preferred sync - write /sys/devices/system/cpu/cpu5/mte_tcf_preferred sync - write /sys/devices/system/cpu/cpu6/mte_tcf_preferred sync - # Big Core: sync - write /sys/devices/system/cpu/cpu7/mte_tcf_preferred sync diff --git a/device-common.mk b/device-common.mk index 841bcf0..fc89a8c 100644 --- a/device-common.mk +++ b/device-common.mk @@ -49,26 +49,3 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Generic zram size setting, can be overridden in project-specific device.mk PRODUCT_VENDOR_PROPERTIES += \ vendor.zram.size?=50p - -# Indicate that the bootloader supports the MTE developer option switch -# (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products and -# eng products that force enable MTE -ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) -ifeq (,$(filter eng,$(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off -# Also enable the system property that would turn on MTE when Android Advanced -# Protection Mode is turned on. -PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_device_policy_manager=true -endif -endif - -ifeq (,$(filter %_fullmte,$(TARGET_PRODUCT))) -ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/zumapro/conf/init.eng.memtag.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.eng.memtag.rc -endif -endif diff --git a/device.mk b/device.mk index 013983e..ab3157e 100644 --- a/device.mk +++ b/device.mk @@ -40,7 +40,6 @@ include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/widevine/widevine.mk include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk -include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk include device/google/gs-common/betterbug/betterbug.mk include device/google/gs-common/recorder/recorder.mk @@ -104,39 +103,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) endif -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -#Set IKE logs to verbose for WFC -PRODUCT_PROPERTY_OVERRIDES += log.tag.IKE=VERBOSE - -#Set Shannon IMS logs to debug -PRODUCT_PROPERTY_OVERRIDES += log.tag.SHANNON_IMS=DEBUG - -#Set Shannon QNS logs to debug -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS=DEBUG -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-ims=DEBUG -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-emergency=DEBUG -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-mms=DEBUG -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-xcap=DEBUG -PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG - -# Modem userdebug -include device/google/zumapro/modem/userdebug.mk -endif - -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 -# change to 60 files from zumapro -PRODUCT_PROPERTY_OVERRIDES += \ - logd.logpersistd=logcatd \ - logd.logpersistd.size=60 - -PRODUCT_PRODUCT_PROPERTIES += \ - ro.logcat.compress=true -endif - # From system.property PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ @@ -214,13 +180,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ telephony.active_modems.max_count=2 -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.usb.displayport.enabled=1 -else -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.usb.displayport.enabled=1 -endif # Enable Settings 2-pane optimization for devices supporting display ports. PRODUCT_SYSTEM_PROPERTIES += \ @@ -259,15 +220,9 @@ PRODUCT_PACKAGES += modem_ml_svc_sit # endif # modem ML models configs -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/zumapro/modem_ml/modem_ml_nnapi_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ - device/google/zumapro/modem_ml/modem_ml_tflite_models_userdebug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf -else PRODUCT_COPY_FILES += \ device/google/zumapro/modem_ml/modem_ml_nnapi_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_models.conf \ device/google/zumapro/modem_ml/modem_ml_tflite_models_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/modem_ml_tflite_models.conf -endif # modem logging binary/configs PRODUCT_PACKAGES += modem_logging_control @@ -505,13 +460,6 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.efs.4k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc endif -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/zumapro/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc -PRODUCT_COPY_FILES += \ - device/google/zumapro/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc -endif - # Recovery files PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zumapro.rc \ @@ -562,20 +510,6 @@ PRODUCT_PACKAGES += \ messaging # CHRE -## tools -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += \ - chre_power_test_client \ - chre_test_client \ - chre_aidl_hal_client -endif - -# PCIe -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += \ - factory_pcie -endif - ## hal include device/google/gs-common/chre/hal.mk PRODUCT_COPY_FILES += \ @@ -595,13 +529,8 @@ PRODUCT_PACKAGES += \ checkpoint_gc # 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 # CP Logging properties PRODUCT_PROPERTY_OVERRIDES += \ @@ -613,13 +542,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.sys.modem.logging.enable=true # Enable silent CP crash handling -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.ril.crash_handling_mode=1 -else PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.ril.crash_handling_mode=2 -endif # Add support dual SIM mode PRODUCT_PROPERTY_OVERRIDES += \ @@ -678,12 +602,6 @@ endif PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml -# default usb debug functions -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.usb.usbradio.config=dm -endif - # adpf 16ms update rate PRODUCT_PRODUCT_PROPERTIES += \ vendor.powerhal.adpf.rate=16666666 @@ -782,12 +700,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ConnectivityOverlay -PRODUCT_PACKAGES_ENG += \ - f2fs_io \ - check_f2fs \ - f2fs.fibmap \ - dump.f2fs - # Storage health HAL PRODUCT_PACKAGES += \ android.hardware.health.storage-service.default @@ -810,9 +722,6 @@ ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) include device/google/gs-common/dauntless/gsc.mk endif -PRODUCT_PACKAGES_ENG += \ - WvInstallKeybox - # Copy Camera HFD Setfiles #PRODUCT_COPY_FILES += \ device/google/zumapro/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \ @@ -869,10 +778,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.slsi_platform=1 \ debug.hwc.winupdate=1 -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += displaycolor_service -endif - PRODUCT_PROPERTY_OVERRIDES += \ debug.sf.disable_backpressure=0 \ debug.sf.enable_gl_backpressure=1 \ @@ -945,11 +850,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += wpa_cli -PRODUCT_PACKAGES += hostapd_cli -endif - #################################### ## VIDEO #################################### @@ -1019,12 +919,6 @@ endif $(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-base.mk) -# Trusty unit test tool -PRODUCT_PACKAGES_ENG += \ - trusty-ut-ctrl \ - tipc-test \ - trusty_stats_test \ - # Trusty Metrics Daemon PRODUCT_SOONG_NAMESPACES += \ vendor/google/trusty/common @@ -1043,15 +937,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.frp.pst=/dev/block/by-name/frp # System props to enable Bluetooth Quality Report (BQR) feature -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.bqr.event_mask?=262174 \ - persist.bluetooth.bqr.min_interval_ms=500 -else PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.bqr.event_mask?=30 \ persist.bluetooth.bqr.min_interval_ms=500 -endif #VNDK PRODUCT_PACKAGES += \ @@ -1083,12 +971,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ Iwlan -#Iwlan test app for eng builds -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += \ - IwlanTestApp -endif - PRODUCT_PACKAGES += \ whitelist \ libstagefright_hdcp \ @@ -1140,13 +1022,6 @@ PRODUCT_COPY_FILES += \ device/google/zumapro/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ -# Vibrator Diag -PRODUCT_PACKAGES_ENG += \ - diag-vibrator \ - diag-vibrator-cs40l25a \ - diag-vibrator-drv2624 \ - $(NULL) - PRODUCT_PACKAGES += \ android.hardware.health-service.zumapro \ android.hardware.health-service.zumapro_recovery \ @@ -1192,23 +1067,6 @@ endif PRODUCT_PACKAGES += vndservicemanager PRODUCT_PACKAGES += vndservice -## TinyTools, debug tool and cs35l41 speaker calibration tool for Audio -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += \ - tinyplay \ - tinycap \ - tinymix \ - tinypcminfo \ - tinyhostless \ - cplay \ - aoc_hal \ - aoc_tuning_inft \ - mahal_test \ - ma_aoc_tuning_test \ - crus_sp_cal \ - pixel_ti_cal -endif - PRODUCT_PACKAGES += \ google.hardware.media.c2@1.0-service \ libgc2_store \ @@ -1290,9 +1148,6 @@ USES_RADIOEXT_V1_7 = true # Wifi ext include hardware/google/pixel/wifi_ext/device.mk -# Battery Stats Viewer -PRODUCT_PACKAGES_ENG += BatteryStatsViewer - # Keymint configuration PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \ @@ -1308,9 +1163,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Hardware Info Collection include hardware/google/pixel/HardwareInfo/HardwareInfo.mk -# UFS: the script is used to select the corresponding firmware to run FFU. -PRODUCT_PACKAGES_ENG += ufs_firmware_update.sh - ifneq ($(BOARD_WITHOUT_RADIO),true) # RIL extension service ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT))) diff --git a/dumpstate/item.mk b/dumpstate/item.mk index 85cc042..692ff8b 100644 --- a/dumpstate/item.mk +++ b/dumpstate/item.mk @@ -1,4 +1 @@ PRODUCT_PACKAGES += dump_power - -PRODUCT_PACKAGES_ENG += dump_gsa.sh - diff --git a/init.hardware.wlc.rc.userdebug b/init.hardware.wlc.rc.userdebug deleted file mode 100644 index dee7b6b..0000000 --- a/init.hardware.wlc.rc.userdebug +++ /dev/null @@ -1,24 +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 property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=1 - write /sys/class/power_supply/dc/current_max 75000 - -on property:sys.boot_completed=1 && property:persist.vendor.limit.wlc.current=0 - write /sys/class/power_supply/dc/current_max 1100000 - -on property:vendor.disable.wlc=1 - write /sys/class/power_supply/wireless/online 0 diff --git a/modem/userdebug.mk b/modem/userdebug.mk deleted file mode 100644 index ba4c0e9..0000000 --- a/modem/userdebug.mk +++ /dev/null @@ -1 +0,0 @@ -PRODUCT_PACKAGES += vcd diff --git a/modem_ml/modem_ml_nnapi_models_userdebug.conf b/modem_ml/modem_ml_nnapi_models_userdebug.conf deleted file mode 100644 index 6582f88..0000000 --- a/modem_ml/modem_ml_nnapi_models_userdebug.conf +++ /dev/null @@ -1,4 +0,0 @@ -#name,version,ml_type,compute_enable,compute_timer,train_enable,train_timer,monitor_enable_monitor_timer,execution_type,execution_timer -fr2_bps_ml_model,0,LEGACY,true,0,false,0,false,0,SYNCHRONOUS_REGULAR,5000 -sample_linear_reg,0,LEGACY,true,5000,true,5000,true,5000,SYNCHRONOUS_REGULAR,5000 -sample_fully_conn,88,LEGACY,true,5000,true,5000,true,5000,SYNCHRONOUS_REGULAR,5000 diff --git a/modem_ml/modem_ml_tflite_models_userdebug.conf b/modem_ml/modem_ml_tflite_models_userdebug.conf deleted file mode 100644 index 9122b5e..0000000 --- a/modem_ml/modem_ml_tflite_models_userdebug.conf +++ /dev/null @@ -1 +0,0 @@ -#name,version,ml_type,compute_enable,compute_timer,train_enable,train_timer,monitor_enable_monitor_timer,use_nnapi,execution_preference,accelerator_name,allow_fp16_precision