diff --git a/Android.bp b/Android.bp index 77f50b3a..57ebe85b 100644 --- a/Android.bp +++ b/Android.bp @@ -34,11 +34,3 @@ license { "NOTICE", ], } - -prebuilt_etc { - name: "preinstalled-packages-product-gs101-device-debug.xml", - src: "preinstalled-packages-product-gs101-device-debug.xml", - product_specific: true, - sub_dir: "sysconfig", - filename_from_src: true, -} diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1ca7c802..d4381460 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -208,12 +208,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.debug.rc b/conf/init.debug.rc deleted file mode 100644 index e8039e08..00000000 --- a/conf/init.debug.rc +++ /dev/null @@ -1,30 +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 - -# Bluetooth -on post-fs-data - chown bluetooth system /dev/logbuffer_btlpm - chown bluetooth system /dev/logbuffer_tty16 - -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 diff --git a/device.mk b/device.mk index 19b1693e..34e981b6 100644 --- a/device.mk +++ b/device.mk @@ -35,7 +35,6 @@ include device/google/gs-common/gps/dump/log.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 oriole raven bluejay, $(TARGET_PRODUCT)),) @@ -91,37 +90,8 @@ 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/gs101/modem/userdebug.mk -endif - include device/google/gs101/modem/user.mk -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 \ @@ -321,11 +291,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.gs101.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.rc -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc -endif - ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ device/google/gs101/storage/5.10/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc @@ -372,14 +337,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 - ## HAL include device/google/gs-common/chre/hal.mk PRODUCT_COPY_FILES += \ @@ -398,13 +355,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 += \ @@ -416,13 +368,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 += \ @@ -476,12 +423,6 @@ PRODUCT_PACKAGES += \ 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 - # Power HAL PRODUCT_COPY_FILES += \ device/google/gs101/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json @@ -570,12 +511,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 @@ -664,10 +599,6 @@ PRODUCT_PACKAGES += \ libdisplaycolor \ hwcomposer.$(TARGET_BOARD_PLATFORM) -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 @@ -741,11 +672,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 #################################### @@ -814,15 +740,9 @@ ifeq (,$(filter tangor citron,$(subst _, ,$(TARGET_PRODUCT)))) include device/google/gs-common/gps/brcm/device.mk PRODUCT_COPY_FILES += \ device/google/gs101/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer -ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_COPY_FILES += \ - device/google/gs101/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs101/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf -else - PRODUCT_COPY_FILES += \ - device/google/gs101/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs101/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf -endif +PRODUCT_COPY_FILES += \ + device/google/gs101/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/gs101/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif # Trusty (KM, GK, Storage) $(call inherit-product, system/core/trusty/trusty-storage.mk) @@ -831,11 +751,6 @@ $(call inherit-product, system/core/trusty/trusty-base.mk) # Trusty dump include device/google/gs-common/trusty/trusty.mk -# Trusty unit test tool -PRODUCT_PACKAGES_ENG += \ - trusty-ut-ctrl \ - tipc-test - include device/google/gs101/trusty_metricsd/trusty_metricsd.mk PRODUCT_PACKAGES += \ @@ -847,15 +762,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 # Enable Bluetooth AutoOn feature PRODUCT_PRODUCT_PROPERTIES += \ @@ -891,12 +800,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 \ @@ -917,9 +820,6 @@ PRODUCT_PACKAGES += ShannonIms $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk) -PRODUCT_PACKAGES_ENG += \ - preinstalled-packages-product-gs101-device-debug.xml - PRODUCT_PACKAGES += ShannonRcs endif @@ -985,13 +885,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv -# Vibrator Diag -PRODUCT_PACKAGES_ENG += \ - diag-vibrator \ - diag-vibrator-cs40l25a \ - diag-vibrator-drv2624 \ - $(NULL) - PRODUCT_PACKAGES += \ android.hardware.health-service.gs101 \ android.hardware.health-service.gs101_recovery \ @@ -1025,22 +918,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ 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 \ - crus_sp_cal \ - mahal_test \ - ma_aoc_tuning_test -endif - PRODUCT_PACKAGES += \ google.hardware.media.c2@1.0-service \ libgc2_store \ @@ -1126,9 +1003,6 @@ endif # Wifi ext include hardware/google/pixel/wifi_ext/device.mk -# Battery Stats Viewer -PRODUCT_PACKAGES_ENG += BatteryStatsViewer - # Install product specific framework compatibility matrix # (TODO: b/169535506) This includes the FCM for system_ext and product partition. # It must be split into the FCM of each partition. diff --git a/fingerprint/extension/Android.bp b/fingerprint/extension/Android.bp deleted file mode 100644 index fa2f13e3..00000000 --- a/fingerprint/extension/Android.bp +++ /dev/null @@ -1,15 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "device_google_gs101_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["device_google_gs101_license"], -} - -sh_binary { - name: "fingerprint.extension.sh", - init_rc: ["init.fingerprint.extension.rc"], - src: "fingerprint.extension.sh", - system_ext_specific: true, -} diff --git a/fingerprint/extension/fingerprint.extension.mk b/fingerprint/extension/fingerprint.extension.mk index 2764fa3d..96e9f89e 100644 --- a/fingerprint/extension/fingerprint.extension.mk +++ b/fingerprint/extension/fingerprint.extension.mk @@ -1,14 +1,4 @@ # Fingerprint extension feature ifneq (,$(filter aosp% factory%, $(TARGET_PRODUCT))) # Skip if device is AOSP or factory build -else - ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT))) - $(call soong_config_set,fp_hal_feature,report_bug_support,true) - BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/vendor/ - SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/public/ - SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/ - PRODUCT_PACKAGES += \ - fps_ext_bug_lib \ - fingerprint.extension.sh - endif endif diff --git a/fingerprint/extension/fingerprint.extension.sh b/fingerprint/extension/fingerprint.extension.sh deleted file mode 100644 index cceae9f8..00000000 --- a/fingerprint/extension/fingerprint.extension.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/system/bin/sh - -# BetterBug required fields -am='am start -a com.google.android.apps.betterbug.intent.FILE_BUG_DEEPLINK --ez EXTRA_DEEPLINK true ' -issueTitle=' --es EXTRA_ISSUE_TITLE ' -additionalComment=' --es EXTRA_ADDITIONAL_COMMENT ' -componentId=' --el EXTRA_COMPONENT_ID ' -requireBugReport=' --ez EXTRA_REQUIRE_BUGREPORT ' -bugAssign=' --es EXTRA_BUG_ASSIGNEE ' -ccGroup=' --es EXTRA_CC ' - -# BetterBug title -kAuthTitle="UDFPS Fingerprint authentication has high failed rate" -kLockoutTitle="UDFPS Fingerprint has too many lockout counts" -kLatencyTitle="UDFPS Fingerprint took long to unlock device" - -# BetterBug context comment -kAuthComment="This bug is auto created by fingerprint HAL to track fingerprint authentication" -kLockoutComment="This bug is auto created by fingerprint HAL to track fingerprint lockout" -kLatencyComment="This bug is auto created by fingerprint HAL to track fingerprint latency" - -# BetterBug assign & CC owner -kBugAssign='udfps_data_study@google.com' -kCcGroup='eddielan@google.com' -kComponentId='817555' - -# Command to send intent to BetterBug -commonCommand="$componentId ${kComponentId//\ /\\ } - $requireBugReport true - $bugAssign ${kBugAssign//\ /\\ } - $ccGroup ${kCcGroup//\ /\\ }" -authCommand="$am $issueTitle ${kAuthTitle//\ /\\ } - $additionalComment ${kAuthComment//\ /\\ }" -lockoutCommand="$am $issueTitle ${kLockoutTitle//\ /\\ } - $additionalComment ${kLockoutComment//\ /\\ }" -latencyCommand="$am $issueTitle ${kLatencyTitle//\ /\\ } - $additionalComment ${kLatencyComment//\ /\\ }" - -# Type of bug being triggered -# 1. Latency -# 2. Lockout -# 3. Finerprint authentication(FRR) -bug_type="$1" - -send=1 -if [ "$bug_type" == "latency" ]; then - intentCommand="$latencyCommand $commonCommand" -elif [ "$bug_type" == "lockout" ]; then - intentCommand="$lockoutCommand $commonCommand" -elif [ "$bug_type" == "auth" ]; then - intentCommand="$authCommand $commonCommand" -else - send=0 - echo "Unknown bug_type $bug_type" -fi - -if [ $send -eq 1 ] -then - eval $intentCommand -fi - -# Exit -exit 0 diff --git a/fingerprint/extension/init.fingerprint.extension.rc b/fingerprint/extension/init.fingerprint.extension.rc deleted file mode 100644 index 9277ce09..00000000 --- a/fingerprint/extension/init.fingerprint.extension.rc +++ /dev/null @@ -1,19 +0,0 @@ -# init-fingerprint-extension-sh is to send intent command to app -# for tracking fingerprint issue. -service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension.sh latency - group shell - user shell - disabled - oneshot - -service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension.sh lockout - group shell - user shell - disabled - oneshot - -service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension.sh auth - group shell - user shell - disabled - oneshot 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/location/lhd.conf b/location/lhd.conf deleted file mode 100644 index c000d582..00000000 --- a/location/lhd.conf +++ /dev/null @@ -1,34 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false -PpsEnable=true diff --git a/location/scd.conf b/location/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/location/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/modem/userdebug.mk b/modem/userdebug.mk deleted file mode 100644 index c56b7d5a..00000000 --- a/modem/userdebug.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifneq ($(BOARD_WITHOUT_RADIO),true) - PRODUCT_PACKAGES += vcd -endif -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101/sepolicy/modem/userdebug/ diff --git a/preinstalled-packages-product-gs101-device-debug.xml b/preinstalled-packages-product-gs101-device-debug.xml deleted file mode 100644 index 88204bca..00000000 --- a/preinstalled-packages-product-gs101-device-debug.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - -