From 3d2d329b19a6dae12789ad5c9802af9bf835b7a4 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 19 Jun 2025 02:37:57 +0300 Subject: [PATCH] caimito: Remove non-existent vendor includes Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27 --- caiman/BoardConfig.mk | 2 -- device-caiman.mk | 10 ---------- device-komodo.mk | 10 ---------- device-tokay.mk | 9 --------- fingerprint/ultrasonic_udfps.mk | 3 --- komodo/BoardConfig.mk | 2 -- tokay/BoardConfig.mk | 2 -- 7 files changed, 38 deletions(-) diff --git a/caiman/BoardConfig.mk b/caiman/BoardConfig.mk index 74de4cd9..62d69ab9 100644 --- a/caiman/BoardConfig.mk +++ b/caiman/BoardConfig.mk @@ -33,9 +33,7 @@ RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_NTNRADIO_DIR) include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk --include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk include device/google/caimito/sepolicy/caiman-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk diff --git a/device-caiman.mk b/device-caiman.mk index fb737e7a..dd2bd1b6 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -49,13 +49,6 @@ LOCAL_PATH := device/google/caimito include device/google/caimito/caiman/uwb/uwb_calibration.mk -$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-caiman.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caiman/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/caiman/device-vendor-caiman.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) - # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay @@ -274,9 +267,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ SettingsCaimanOverlay -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts - # UWB PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/caiman/uwb diff --git a/device-komodo.mk b/device-komodo.mk index 1eef50fd..0c425546 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -49,13 +49,6 @@ LOCAL_PATH := device/google/caimito include device/google/caimito/komodo/uwb/uwb_calibration.mk -$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-komodo.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/komodo/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/komodo/device-vendor-komodo.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) - # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay @@ -291,9 +284,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ SettingsKomodoOverlay -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts - # UWB PRODUCT_SOONG_NAMESPACES += \ device/google/caimito/komodo/uwb diff --git a/device-tokay.mk b/device-tokay.mk index 553b0dae..3c15ec6b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -45,12 +45,6 @@ TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers endif -$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/tokay/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/google_devices/caimito/proprietary/tokay/device-vendor-tokay.mk) - # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay @@ -267,9 +261,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ SettingsTokayOverlay -# Trusty liboemcrypto.so -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts - # Location PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk index db9f943d..95696d89 100644 --- a/fingerprint/ultrasonic_udfps.mk +++ b/fingerprint/ultrasonic_udfps.mk @@ -14,9 +14,6 @@ # limitations under the License. # -PRODUCT_SOONG_NAMESPACES += \ - vendor/qcom/fingerprint/qfp-service - PRODUCT_PACKAGES += \ qfp-daemon diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk index 5611e0a8..1f81f550 100644 --- a/komodo/BoardConfig.mk +++ b/komodo/BoardConfig.mk @@ -27,9 +27,7 @@ RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_KOMODO_NTNRADIO_DIR) include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk --include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/komodo/proprietary/BoardConfigVendor.mk include device/google/caimito/sepolicy/komodo-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk diff --git a/tokay/BoardConfig.mk b/tokay/BoardConfig.mk index e5abc0f2..b2987198 100644 --- a/tokay/BoardConfig.mk +++ b/tokay/BoardConfig.mk @@ -33,9 +33,7 @@ RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_TOKAY_NTNRADIO_DIR) include device/google/caimito/device-caimito-common.mk include device/google/zumapro/BoardConfig-common.mk --include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk --include vendor/google_devices/tokay/proprietary/BoardConfigVendor.mk include device/google/caimito/sepolicy/tokay-sepolicy.mk include device/google/caimito/wifi/BoardConfig-wifi.mk