diff --git a/akita/BoardConfig.mk b/akita/BoardConfig.mk index 043e239..8ceccbe 100644 --- a/akita/BoardConfig.mk +++ b/akita/BoardConfig.mk @@ -38,9 +38,7 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += disable_dma32=on include device/google/zuma/BoardConfig-common.mk --include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/akita/proprietary/BoardConfigVendor.mk include device/google/akita/sepolicy/akita-sepolicy.mk include device/google/akita/wifi/BoardConfig-wifi.mk diff --git a/device-akita.mk b/device-akita.mk index c8f9158..b62c7df 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -14,8 +14,6 @@ # limitations under the License. # -PRODUCT_RELEASE_CONFIG_MAPS += $(wildcard vendor/google_devices/release/phones/./pixel_2024_midyear/release_config_map.textproto) - TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR) @@ -25,13 +23,6 @@ ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION) endif -$(call inherit-product-if-exists, vendor/google_devices/akita/prebuilts/device-vendor-akita.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/akita/proprietary/akita/device-vendor-akita.mk) -$(call inherit-product-if-exists, vendor/google_devices/akita/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/akita/proprietary/WallpapersAkita.mk) - DEVICE_PACKAGE_OVERLAYS += device/google/akita/akita/overlay ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL_ZUMA),true) @@ -311,9 +302,6 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_PACKAGES += \ WifiOverlay2024Mid -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/akita/prebuilts - # include GNSSD include device/google/akita/location/device-gnss.mk @@ -326,11 +314,6 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.increase_thread_priority_nodes_stop=true -# Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) -$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) - # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 diff --git a/location/device-gnss.mk b/location/device-gnss.mk index c2be2b1..f4c663c 100644 --- a/location/device-gnss.mk +++ b/location/device-gnss.mk @@ -1,6 +1,3 @@ -# include common gnss binaries --include vendor/samsung_slsi/gps/s5300/gnss_release.mk - DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \ device/google/akita/location/device_framework_matrix_product.xml @@ -10,6 +7,3 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/akita/location/gps_user.cfg:vendor/etc/gnss/gps.cfg - -# include pixel gnss hal service --include vendor/google_devices/gs-common/proprietary/gps/pixel_gnss_hal.mk