From c3622def851e2507517e05b84d80cf34b9cb73ed Mon Sep 17 00:00:00 2001 From: chenkris Date: Tue, 13 Jun 2023 03:08:37 +0000 Subject: [PATCH] udfps: fix BB on git_master-without-vendor Bug: 286774587 Test: Build Change-Id: I257f49da38be01adf72a789dd6dc1830fe481e73 --- device-husky.mk | 6 +++--- device-shiba.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index 50cae19..1595460 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -247,11 +247,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty $(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app) -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-shiba.mk b/device-shiba.mk index ba10f0c..9cdc0ea 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -235,11 +235,11 @@ PRODUCT_VENDOR_PROPERTIES += \ # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty $(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app) -include vendor/goodix/udfps/configuration/udfps_common.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include vendor/goodix/udfps/configuration/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include vendor/goodix/udfps/configuration/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Fingerprint exposure compensation