Switch bootloader directory to control by build flag

Bug: 333834221
Change-Id: I71813042214ef6407b6389a1f2e57c1ffd84a2f9
This commit is contained in:
Cyan_Hsieh 2024-04-18 16:27:53 +08:00
parent 38562b32f8
commit 7e6f1e6cf0
6 changed files with 11 additions and 73 deletions

View file

@ -265,15 +265,6 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION)))
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q3
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# Location
# SDK build system
@ -300,16 +291,8 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION)))
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q3
else
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
endif
GOODIX_CONFIG_BUILD_VERSION := g7_trusty
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)