Merge "Make g7 TA name configurable" into main
This commit is contained in:
commit
e91c6add4b
2 changed files with 2 additions and 2 deletions
|
@ -284,7 +284,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||||
|
|
||||||
# Fingerprint HAL
|
# Fingerprint HAL
|
||||||
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
||||||
$(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app)
|
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
|
||||||
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
|
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
|
||||||
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
|
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
|
||||||
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
|
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
|
||||||
|
|
|
@ -265,7 +265,7 @@ PRODUCT_VENDOR_PROPERTIES += \
|
||||||
|
|
||||||
# Fingerprint HAL
|
# Fingerprint HAL
|
||||||
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
|
||||||
$(call soong_config_set,goodix,fingerprint_ta,//vendor/google_devices/shusky/prebuilts:g7.app)
|
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
|
||||||
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
|
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
|
||||||
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
|
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
|
||||||
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
|
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue