diff --git a/Android.bp b/Android.bp index 150a519c..9b83b174 100644 --- a/Android.bp +++ b/Android.bp @@ -34,11 +34,3 @@ license { "NOTICE", ], } - -prebuilt_etc { - name: "preinstalled-packages-product-gs201-device-debug.xml", - src: "preinstalled-packages-product-gs201-device-debug.xml", - product_specific: true, - sub_dir: "sysconfig", - filename_from_src: true, -} diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 53135d02..e87191d9 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -236,12 +236,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) -endif - ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) $(call soong_config_set,aoc_audio_func,aosp_build,true) endif diff --git a/conf/init.check_ap_pd_auth.sh b/conf/init.check_ap_pd_auth.sh deleted file mode 100644 index 8175e754..00000000 --- a/conf/init.check_ap_pd_auth.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/vendor/bin/sh - -# This script sets up `ro.vendor.sjtag_ap_is_unlocked` for the non-fused -# device. For a fused device, this property should be set by -# betterbug->ss-restart-detector when PD is acquired. - -SJTAG_STATUS=0x$(cat /sys/devices/platform/sjtag_ap/interface/status) -SOFT_LOCK_BIT=4 -AUTH_PASS_BIT=8 - -# Unlocked or locked but auth passed. -if test "$((SJTAG_STATUS & (1 << SOFT_LOCK_BIT)))" = 0 -o \ - "$((SJTAG_STATUS & (1 << AUTH_PASS_BIT)))" != 0 ; then - setprop ro.vendor.sjtag_ap_is_unlocked true -fi diff --git a/conf/init.debug.rc b/conf/init.debug.rc deleted file mode 100644 index eb970541..00000000 --- a/conf/init.debug.rc +++ /dev/null @@ -1,60 +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_btpower - 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" - -service vendor.check_ap_pd_auth_sh /vendor/bin/init.check_ap_pd_auth.sh - class main - user root - group root system - oneshot - -# Enable etm/etm2dram when ramdump is enabled, and ap-sjtag is unlocked. -on property:ro.boot.ramdump=enabled && property:ro.vendor.sjtag_ap_is_unlocked=true - write /sys/devices/platform/exynos-etm/etm_on 1 - write /sys/devices/platform/etm2dram/arm 1 diff --git a/device.mk b/device.mk index 9d7d1ff7..6c3e7691 100644 --- a/device.mk +++ b/device.mk @@ -35,7 +35,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 ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) @@ -98,35 +97,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/gs201/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 -PRODUCT_PROPERTY_OVERRIDES += \ - logd.logpersistd=logcatd \ - logd.logpersistd.size=30 -endif - # From system.property PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ @@ -370,12 +340,6 @@ PRODUCT_COPY_FILES += \ device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc endif -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/gs201/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc \ - device/google/gs201/conf/init.check_ap_pd_auth.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.check_ap_pd_auth.sh -endif - # Recovery files PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs201.rc @@ -406,14 +370,6 @@ PRODUCT_HOST_PACKAGES += \ mkdtimg # CHRE -## tools -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PACKAGES += \ - chre_power_test_client \ - chre_test_client \ - chre_aidl_hal_client -endif - ## HAL include device/google/gs-common/chre/hal.mk PRODUCT_COPY_FILES += \ @@ -437,13 +393,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 # RPMB TA PRODUCT_PACKAGES += \ @@ -492,13 +443,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.euicc.mep.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.mep.xml endif -# default usb debug functions -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.usb.usbradio.config=dm -endif - - PRODUCT_COPY_FILES += \ device/google/gs201/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json @@ -605,12 +549,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ConnectivityOverlay -PRODUCT_PACKAGES_ENG += \ - f2fs_io \ - check_f2fs \ - f2fs.fibmap \ - dump.f2fs - # Storage dump include device/google/gs-common/storage/storage.mk @@ -636,9 +574,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/gs201/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \ @@ -690,10 +625,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 \ @@ -768,11 +699,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 #################################### @@ -843,13 +769,6 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty dump include device/google/gs-common/trusty/trusty.mk -# Trusty unit test and code coverage tool -PRODUCT_PACKAGES_ENG += \ - trusty-ut-ctrl \ - tipc-test \ - trusty_stats_test \ - trusty-coverage-controller \ - # Trusty Secure DPU Daemon PRODUCT_PACKAGES += \ securedpud.slider @@ -871,15 +790,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 += \ @@ -915,12 +828,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 \ @@ -939,9 +846,6 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA PRODUCT_PACKAGES += ShannonIms -PRODUCT_PACKAGES_ENG += \ - preinstalled-packages-product-gs201-device-debug.xml - PRODUCT_PACKAGES += ShannonRcs endif @@ -979,13 +883,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 += \ @@ -1023,13 +922,6 @@ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.cfg \ device/google/$(TARGET_BOARD_PLATFORM)/radio/config/Pixel_stability.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/Pixel_stability.nprf \ -# Vibrator Diag -PRODUCT_PACKAGES_ENG += \ - diag-vibrator \ - diag-vibrator-cs40l25a \ - diag-vibrator-drv2624 \ - $(NULL) - PRODUCT_PACKAGES += \ android.hardware.health-service.gs201 \ android.hardware.health-service.gs201_recovery \ @@ -1066,22 +958,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 -endif - PRODUCT_PACKAGES += \ google.hardware.media.c2@1.0-service \ libgc2_store \ @@ -1164,8 +1040,6 @@ USES_RADIOEXT_V1_5 = true # Wifi ext include hardware/google/pixel/wifi_ext/device.mk -# Battery Stats Viewer -PRODUCT_PACKAGES_ENG += BatteryStatsViewer include device/google/gs201/dumpstate/item.mk # Install product specific framework compatibility matrix diff --git a/init.hardware.wlc.rc.userdebug b/init.hardware.wlc.rc.userdebug deleted file mode 100644 index dee7b6bc..00000000 --- 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 2b0c3983..00000000 --- a/modem/userdebug.mk +++ /dev/null @@ -1,3 +0,0 @@ -ifneq ($(BOARD_WITHOUT_RADIO),true) - PRODUCT_PACKAGES += vcd -endif diff --git a/preinstalled-packages-product-gs201-device-debug.xml b/preinstalled-packages-product-gs201-device-debug.xml deleted file mode 100644 index 58eb9dbc..00000000 --- a/preinstalled-packages-product-gs201-device-debug.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -