diff --git a/AndroidProducts.mk b/AndroidProducts.mk index fede486..d0f7e11 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,9 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_felix.mk \ - $(LOCAL_DIR)/aosp_felix_hwasan.mk \ - $(LOCAL_DIR)/factory_felix.mk \ $(LOCAL_DIR)/lineage_felix.mk - -COMMON_LUNCH_CHOICES := \ - aosp_felix-trunk_staging-userdebug diff --git a/aosp_felix_hwasan.mk b/aosp_felix_hwasan.mk deleted file mode 100644 index 3ea3672..0000000 --- a/aosp_felix_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/felix/aosp_felix.mk) -PRODUCT_NAME := aosp_felix_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/felix/config/mixer_paths_factory.xml b/audio/felix/config/mixer_paths_factory.xml deleted file mode 100644 index 410cbc2..0000000 --- a/audio/felix/config/mixer_paths_factory.xml +++ /dev/null @@ -1,384 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/felix/factory-audio-tables.mk b/audio/felix/factory-audio-tables.mk deleted file mode 100644 index e5056d8..0000000 --- a/audio/felix/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 := felix - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/felix/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml - diff --git a/device-felix.mk b/device-felix.mk index 59bbf6c..46aa5ad 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -43,9 +43,8 @@ include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/display/dump_exynos_second_display.mk include device/google/gs-common/touch/gti/predump_gti_dual.mk include device/google/gs-common/touch/stm/predump_stm6.mk -ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) + include device/google/felix/uwb/uwb_calibration.mk -endif # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,felix) diff --git a/factory_felix.mk b/factory_felix.mk deleted file mode 100644 index f689922..0000000 --- a/factory_felix.mk +++ /dev/null @@ -1,34 +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/felix/device-felix.mk) -include device/google/felix/audio/felix/factory-audio-tables.mk - -PRODUCT_NAME := factory_felix -PRODUCT_DEVICE := felix -PRODUCT_MODEL := Factory build on Felix -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 binary of camera -PRODUCT_PACKAGES += fatp_f10_wide_hat_tool fatp_f10_tele_hat_tool diff --git a/fingerprint_config.mk b/fingerprint_config.mk index 1f9b521..5610936 100644 --- a/fingerprint_config.mk +++ b/fingerprint_config.mk @@ -1,11 +1,5 @@ -# 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/event2 GOOGLE_CONFIG_DP_COUNT=2 GOOGLE_CONFIG_FP_STATUS=1 GOOGLE_CONFIG_TOUCH_TO_UNLOCK_ANYTIME=1 -endif