From 220a3a4bc032f9a06b10a095518d414833f44cbd Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 01:45:29 +0300 Subject: [PATCH] tegu: Remove all boards except tegu Change-Id: Ib34dd38d55f39e9a61c0f61d9c659e07494177a1 --- AndroidProducts.mk | 5 - aosp_tegu.mk | 2 +- aosp_tegu_fullmte.mk | 5 - audio/tegu/config/mixer_paths_factory.xml | 348 ---------------------- audio/tegu/factory-audio-tables.mk | 22 -- device-tegu.mk | 4 - factory_tegu.mk | 42 --- fullmte-common.mk | 2 - fullmte-vars.mk | 4 - location/factory-gnss.mk | 3 - nfc/libnfc-hal-st-disable.conf | 152 ---------- nfc/libse-gto-hal-disable.conf | 2 - tegu_generic.mk | 20 -- 13 files changed, 1 insertion(+), 610 deletions(-) delete mode 100644 aosp_tegu_fullmte.mk delete mode 100644 audio/tegu/config/mixer_paths_factory.xml delete mode 100644 audio/tegu/factory-audio-tables.mk delete mode 100644 factory_tegu.mk delete mode 100644 fullmte-common.mk delete mode 100644 fullmte-vars.mk delete mode 100644 location/factory-gnss.mk delete mode 100644 nfc/libnfc-hal-st-disable.conf delete mode 100644 nfc/libse-gto-hal-disable.conf delete mode 100644 tegu_generic.mk diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1889281..1108286 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,9 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_tegu.mk \ - $(LOCAL_DIR)/aosp_tegu_fullmte.mk \ - $(LOCAL_DIR)/factory_tegu.mk \ $(LOCAL_DIR)/lineage_tegu.mk - -COMMON_LUNCH_CHOICES := \ - aosp_tegu-trunk_staging-userdebug diff --git a/aosp_tegu.mk b/aosp_tegu.mk index 1a693cf..ecb0cd3 100644 --- a/aosp_tegu.mk +++ b/aosp_tegu.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false $(call inherit-product, device/google/zumapro/aosp_common.mk) -$(call inherit-product, device/google/tegu/tegu_generic.mk) +$(call inherit-product, device/google/tegu/device-tegu.mk) PRODUCT_NAME := aosp_tegu PRODUCT_DEVICE := tegu diff --git a/aosp_tegu_fullmte.mk b/aosp_tegu_fullmte.mk deleted file mode 100644 index 117ef9f..0000000 --- a/aosp_tegu_fullmte.mk +++ /dev/null @@ -1,5 +0,0 @@ -include device/google/tegu/fullmte-vars.mk -$(call inherit-product, device/google/tegu/aosp_tegu.mk) -$(call inherit-product, device/google/tegu/fullmte-common.mk) - -PRODUCT_NAME := aosp_tegu_fullmte diff --git a/audio/tegu/config/mixer_paths_factory.xml b/audio/tegu/config/mixer_paths_factory.xml deleted file mode 100644 index 7cc10b1..0000000 --- a/audio/tegu/config/mixer_paths_factory.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tegu/factory-audio-tables.mk b/audio/tegu/factory-audio-tables.mk deleted file mode 100644 index f626ffb..0000000 --- a/audio/tegu/factory-audio-tables.mk +++ /dev/null @@ -1,22 +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. -# - -AUDIO_FACTORY_TABLE_FOLDER := tegu - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/tegu/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml - diff --git a/device-tegu.mk b/device-tegu.mk index 7f98bb0..d8aaa34 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -384,11 +384,7 @@ PRODUCT_VENDOR_PROPERTIES += \ GOODIX_CONFIG_BUILD_VERSION := g7_trusty PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tegu/prebuilts/firmware/fingerprint $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) -else -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) -endif # Fingerprint exposure compensation PRODUCT_VENDOR_PROPERTIES += \ diff --git a/factory_tegu.mk b/factory_tegu.mk deleted file mode 100644 index 79e5ba7..0000000 --- a/factory_tegu.mk +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright 2021 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. -# - -TARGET_LINUX_KERNEL_VERSION := 6.1 - -$(call inherit-product, device/google/zumapro/factory_common.mk) -$(call inherit-product, device/google/tegu/device-tegu.mk) -include device/google/tegu/audio/tegu/factory-audio-tables.mk - -# Factory binaries for GPS -include device/google/tegu/location/factory-gnss.mk - -PRODUCT_NAME := factory_tegu -PRODUCT_DEVICE := tegu -PRODUCT_MODEL := Factory build on Tegu -PRODUCT_BRAND := Android -PRODUCT_MANUFACTURER := Google - -# default BDADDR for EVB only -PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55" - -# Factory binaries of camera -PRODUCT_PACKAGES += fatp_tg4_wide_hat_tool - -PRODUCT_WITHOUT_TTS_VOICE_PACKS := true - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/fullmte-common.mk b/fullmte-common.mk deleted file mode 100644 index 1591a33..0000000 --- a/fullmte-common.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON -PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync diff --git a/fullmte-vars.mk b/fullmte-vars.mk deleted file mode 100644 index c8c87ff..0000000 --- a/fullmte-vars.mk +++ /dev/null @@ -1,4 +0,0 @@ -ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),) - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack) - SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap) -endif diff --git a/location/factory-gnss.mk b/location/factory-gnss.mk deleted file mode 100644 index 84f2903..0000000 --- a/location/factory-gnss.mk +++ /dev/null @@ -1,3 +0,0 @@ -# include factory gnss binaries --include vendor/samsung_slsi/gps/s5300/gnss_factory.mk - diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf deleted file mode 100644 index 7801d1b..0000000 --- a/nfc/libnfc-hal-st-disable.conf +++ /dev/null @@ -1,152 +0,0 @@ -########################### Start of libnf-hal-st_aosp.conf ########################### - -############################################################################### -############################################################################### -# ST HAL trace log level -STNFC_HAL_LOGLEVEL=4 -NFC_DEBUG_ENABLED=1 - -############################################################################### -# Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=0 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Dev Node used for ST HAL -ST_NFC_DEV_NODE="/dev/st_no_such_device" - -############################################################################### -# Keep the nfa storage file. -PRESERVE_STORAGE=1 - -############################################################################### -# In Switch OFF mode (phone switched-off), specify the desired CE mode to -# the controller. -# 0: No card-emulation; DEFAULT -# 1: Switch-off card-emulation enabled -CE_ON_SWITCH_OFF_STATE=1 - -############################################################################### -# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off. -STNFC_USB_CHARGING_MODE=1 - -############################################################################### -# Vendor Specific Proprietary Protocol & Discovery Configuration -# Set to 0xFF if unsupported -# byte[0] NCI_PROTOCOL_18092_ACTIVE -# byte[1] NCI_PROTOCOL_B_PRIME -# byte[2] NCI_PROTOCOL_DUAL -# byte[3] NCI_PROTOCOL_15693 -# byte[4] NCI_PROTOCOL_KOVIO -# byte[5] NCI_PROTOCOL_MIFARE -# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO -# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME -# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME -NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF} - -############################################################################### -# Choose the presence-check algorithm for type-4 tag. If not defined, -# the default value is 1. -# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm -# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block -# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate -# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 -# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 -# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0 -PRESENCE_CHECK_ALGORITHM=5 - -############################################################################### -# Name of the NCI HAL module to use -# If unset, falls back to nfc_nci.bcm2079x -NCI_HAL_MODULE="nfc_nci.st21nfc.default" - -############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} - -############################################################################### -# BAIL OUT value for P2P -# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol. -POLL_BAIL_OUT_MODE=1 - -############################################################################### -# Extended APDU length for ISO_DEP -ISO_DEP_MAX_TRANSCEIVE=0xFEFF - -############################################################################### -# Configure the NFC Extras to open and use a static pipe. If the value is -# not set or set to 0, then the default is use a dynamic pipe based on a -# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value -# for each EE (ESE/SIM) -OFF_HOST_ESE_PIPE_ID=0x5E -OFF_HOST_SIM_PIPE_ID=0x3E - -############################################################################### -#Set the default Felica T3T System Code OffHost route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_SYS_CODE_ROUTE=0x86 - -############################################################################### -#Set the Felica T3T System Code supported power state: -DEFAULT_SYS_CODE_PWR_STATE=0x3B - -############################################################################### -# Path and Files used for FW update binaries storage -STNFC_FW_PATH_STORAGE="/vendor/firmware" -STNFC_FW_BIN_NAME="/st54l_fw.bin" -STNFC_FW_CONF_NAME="/st54l_conf.bin" - -############################################################################### -# Default off-host route for Felica. -# This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_NFCF_ROUTE=0x86 - -############################################################################### -# Configure the default off-host route. -# used for technology A and B routing -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_OFFHOST_ROUTE=0x81 - -############################################################################### -# Configure the default AID route. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ROUTE=0x00 - -############################################################################### -# Configure the NFCEEIDs of offhost UICC. -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -OFFHOST_ROUTE_UICC={81} - -############################################################################### -# Configure the NFCEEIDs of offhost eSEs. -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -OFFHOST_ROUTE_ESE={86} - -############################################################################### -# Configure the list of NFCEE for the ISO-DEP routing. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ISODEP_ROUTE=0x81 - -############################################################################### -# Core configuration settings -CORE_CONF_PROP={ 20, 02, 0a, 03, - a1, 01, 1e, - a2, 01, 19, - 80, 01, 01 -} - - diff --git a/nfc/libse-gto-hal-disable.conf b/nfc/libse-gto-hal-disable.conf deleted file mode 100644 index 50e925c..0000000 --- a/nfc/libse-gto-hal-disable.conf +++ /dev/null @@ -1,2 +0,0 @@ -#Gemalto SPI devnode -GTO_DEV=/dev/nothing; diff --git a/tegu_generic.mk b/tegu_generic.mk deleted file mode 100644 index fc03ac5..0000000 --- a/tegu_generic.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright 2024 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. -# -$(call inherit-product, device/google/tegu/device-tegu.mk) - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common -