Merge "Revert "usf: Include usf_product.mk for USF PDK.""

This commit is contained in:
Krzysztof Kosiński 2022-10-13 22:11:52 +00:00 committed by Android (Google) Code Review
commit 1284a92253

View file

@ -889,11 +889,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
#$(call inherit-product-if-exists, hardware/google_devices/zuma/zuma.mk) #$(call inherit-product-if-exists, hardware/google_devices/zuma/zuma.mk)
#$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk) #$(call inherit-product-if-exists, vendor/google_devices/common/exynos-vendor.mk)
#$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk) #$(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4375/device-bcm.mk)
ifeq ($(wildcard vendor/google/sensors/usf),)
$(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/usf/usf_product.mk)
else
$(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk) $(call inherit-product-if-exists, vendor/google/sensors/usf/android/usf_efw_product.mk)
endif
$(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk) $(call inherit-product-if-exists, vendor/google/services/LyricCameraHAL/src/build/device-vendor.mk)
$(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk) $(call inherit-product-if-exists, vendor/google/camera/devices/whi/device-vendor.mk)