caimito: Remove non-existent vendor includes

Change-Id: I1bc76430d30259984f4eb91907be61ef39646c27
This commit is contained in:
Michael Bestas 2025-06-19 02:37:57 +03:00 committed by Michael Bestas
parent 3ab4ff30c6
commit 3d2d329b19
No known key found for this signature in database
7 changed files with 0 additions and 38 deletions

View file

@ -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/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-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 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/sepolicy/caiman-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk

View file

@ -49,13 +49,6 @@ LOCAL_PATH := device/google/caimito
include device/google/caimito/caiman/uwb/uwb_calibration.mk 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 # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/caiman/overlay
@ -274,9 +267,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
SettingsCaimanOverlay SettingsCaimanOverlay
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# UWB # UWB
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
device/google/caimito/caiman/uwb device/google/caimito/caiman/uwb

View file

@ -49,13 +49,6 @@ LOCAL_PATH := device/google/caimito
include device/google/caimito/komodo/uwb/uwb_calibration.mk 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 # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/komodo/overlay
@ -291,9 +284,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
SettingsKomodoOverlay SettingsKomodoOverlay
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# UWB # UWB
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
device/google/caimito/komodo/uwb device/google/caimito/komodo/uwb

View file

@ -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 TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif 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 # display
DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay
@ -267,9 +261,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
SettingsTokayOverlay SettingsTokayOverlay
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts
# Location # Location
PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay
$(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT))

View file

@ -14,9 +14,6 @@
# limitations under the License. # limitations under the License.
# #
PRODUCT_SOONG_NAMESPACES += \
vendor/qcom/fingerprint/qfp-service
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
qfp-daemon qfp-daemon

View file

@ -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/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-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 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/sepolicy/komodo-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk

View file

@ -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/caimito/device-caimito-common.mk
include device/google/zumapro/BoardConfig-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 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/sepolicy/tokay-sepolicy.mk
include device/google/caimito/wifi/BoardConfig-wifi.mk include device/google/caimito/wifi/BoardConfig-wifi.mk