diff --git a/AndroidProducts.mk b/AndroidProducts.mk index c234e11..7237e62 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -16,10 +16,4 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_akita.mk \ - $(LOCAL_DIR)/aosp_akita_16k.mk \ - $(LOCAL_DIR)/aosp_akita_fullmte.mk \ - $(LOCAL_DIR)/factory_akita.mk \ $(LOCAL_DIR)/lineage_akita.mk - -COMMON_LUNCH_CHOICES := \ - aosp_akita-trunk_staging-userdebug diff --git a/akita_generic.mk b/akita_generic.mk deleted file mode 100644 index bb260cd..0000000 --- a/akita_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/akita/device-akita.mk) - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/aosp_akita.mk b/aosp_akita.mk index d9c41e8..761d124 100644 --- a/aosp_akita.mk +++ b/aosp_akita.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/akita/akita_generic.mk) +$(call inherit-product, device/google/akita/device-akita.mk) PRODUCT_NAME := aosp_akita PRODUCT_DEVICE := akita diff --git a/aosp_akita_16k.mk b/aosp_akita_16k.mk deleted file mode 100644 index 3f4ecfb..0000000 --- a/aosp_akita_16k.mk +++ /dev/null @@ -1,8 +0,0 @@ -$(call inherit-product, device/google/akita/aosp_akita.mk) - -PRODUCT_NAME := aosp_akita_16k - -TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_RW_FILE_SYSTEM_TYPE := ext4 -TARGET_BOOTS_16K := true - diff --git a/aosp_akita_fullmte.mk b/aosp_akita_fullmte.mk deleted file mode 100644 index 446693a..0000000 --- a/aosp_akita_fullmte.mk +++ /dev/null @@ -1,4 +0,0 @@ -include device/google/gs-common/mte/fullmte-pixel.mk -$(call inherit-product, device/google/akita/aosp_akita.mk) - -PRODUCT_NAME := aosp_akita_fullmte diff --git a/audio/akita/config/mixer_paths_factory.xml b/audio/akita/config/mixer_paths_factory.xml deleted file mode 100644 index 87bfa04..0000000 --- a/audio/akita/config/mixer_paths_factory.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/akita/config/mixer_paths_factory_ti.xml b/audio/akita/config/mixer_paths_factory_ti.xml deleted file mode 100644 index 1a2fda3..0000000 --- a/audio/akita/config/mixer_paths_factory_ti.xml +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/akita/factory-audio-tables.mk b/audio/akita/factory-audio-tables.mk deleted file mode 100644 index e590f03..0000000 --- a/audio/akita/factory-audio-tables.mk +++ /dev/null @@ -1,23 +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 := akita - -# Mixer Path Configuration for Audio Factory -PRODUCT_COPY_FILES += \ - device/google/akita/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml \ - device/google/akita/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory_ti.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory_ti.xml - diff --git a/device-akita.mk b/device-akita.mk index dee4dff..b9b703c 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -349,11 +349,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty $(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 # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 diff --git a/factory_akita.mk b/factory_akita.mk deleted file mode 100644 index aae1617..0000000 --- a/factory_akita.mk +++ /dev/null @@ -1,37 +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.15 - -$(call inherit-product, device/google/zuma/factory_common.mk) -$(call inherit-product, device/google/akita/device-akita.mk) -include device/google/akita/audio/akita/factory-audio-tables.mk - -PRODUCT_NAME := factory_akita -PRODUCT_DEVICE := akita -PRODUCT_MODEL := Factory build on Akita -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_ak3_wide_hat_tool - -# preloaded_nanoapps.json -PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/location/factory-gnss.mk b/location/factory-gnss.mk deleted file mode 100644 index d9c2b88..0000000 --- a/location/factory-gnss.mk +++ /dev/null @@ -1,2 +0,0 @@ -# include factory gnss binaries --include vendor/samsung_slsi/gps/s5300/gnss_factory.mk