diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1df1dc8..a0f076e 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,9 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_tangorpro.mk \ - $(LOCAL_DIR)/aosp_tangorpro_hwasan.mk \ - $(LOCAL_DIR)/factory_tangorpro.mk \ $(LOCAL_DIR)/lineage_tangorpro.mk - -COMMON_LUNCH_CHOICES := \ - aosp_tangorpro-trunk_staging-userdebug diff --git a/aosp_tangorpro_hwasan.mk b/aosp_tangorpro_hwasan.mk deleted file mode 100644 index 2e55e64..0000000 --- a/aosp_tangorpro_hwasan.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright 2023 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/tangorpro/aosp_tangorpro.mk) -PRODUCT_NAME := aosp_tangorpro_hwasan - -# Add "hwaddress" as a global sanitizer if it's missing. -ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),) - SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress) -endif diff --git a/audio/tangorpro/config/mixer_paths_factory.xml b/audio/tangorpro/config/mixer_paths_factory.xml deleted file mode 100644 index 7404fbb..0000000 --- a/audio/tangorpro/config/mixer_paths_factory.xml +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/tangorpro/factory-audio-tables.mk b/audio/tangorpro/factory-audio-tables.mk deleted file mode 100644 index 8d4ecb9..0000000 --- a/audio/tangorpro/factory-audio-tables.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (C) 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. -# - -AUDIO_FACTORY_TABLE_FOLDER := tangorpro - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/tangorpro/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml - diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 55aa6ff..3554b3c 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -67,9 +67,7 @@ $(call soong_config_set,lyric,camera_hardware,tangorpro) $(call soong_config_set,lyric,tuning_product,tangorpro) $(call soong_config_set,google3a_config,target_device,tangorpro) -ifeq ($(filter factory_tangorpro, $(TARGET_PRODUCT)),) include device/google/tangorpro/uwb/uwb_calibration.mk -endif # Preopt SystemUI ifneq ($(RELEASE_SYSTEMUI_USE_SPEED_PROFILE), true) diff --git a/factory_tangorpro.mk b/factory_tangorpro.mk deleted file mode 100644 index 95b3acb..0000000 --- a/factory_tangorpro.mk +++ /dev/null @@ -1,44 +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 := 5.10 - -$(call inherit-product, device/google/gs201/factory_common.mk) -$(call inherit-product, device/google/tangorpro/device-tangorpro.mk) -include device/google/tangorpro/audio/tangorpro/factory-audio-tables.mk - -PRODUCT_NAME := factory_tangorpro -PRODUCT_DEVICE := tangorpro -PRODUCT_MODEL := Factory build on Tangorpro -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_imx787_hat_tool - -# Factory binaries of wifi -PRODUCT_PACKAGES += myftm - -# Tool for installing Cast keybox -PRODUCT_PACKAGES_DEBUG += \ - CastInstallKeybox - -# Display CABC for factory setting -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.cabc.supported=0 diff --git a/fingerprint_config.mk b/fingerprint_config.mk index c28cb6a..ebc9315 100644 --- a/fingerprint_config.mk +++ b/fingerprint_config.mk @@ -1,10 +1,4 @@ -# Factory build, use HIDL hal & extension so that we can use Test tool -ifneq ( ,$(findstring factory, $(TARGET_PRODUCT))) -GOOGLE_CONFIG_FP_STATUS=1 -FPC_CONFIG_TRUSTY_CLEAN_TA=1 -else # Non factory build, use fingerprint AIDL version GOOGLE_CONFIG_POWER_NODE=/dev/input/event1 GOOGLE_CONFIG_FP_STATUS=1 GOOGLE_CONFIG_TOUCH_TO_UNLOCK_ANYTIME=1 -endif