Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Split bootloader prebuilt to 24Q1 and trunk version" into main

Browse source
This commit is contained in:
Cyan Hsieh 2023-10-23 04:06:08 +00:00 • committed by Android (Google) Code Review
commit d3c036f8d0
6 changed files with 42 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
device-husky.mk
View file

@ -257,6 +257,11 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# UWB # UWB
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
@ -287,8 +292,12 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL # Fingerprint HAL
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
else
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
endif
GOODIX_CONFIG_BUILD_VERSION := g7_trusty 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) $(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)

5
device-ripcurrent.mk
View file

@ -211,6 +211,11 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# UWB # UWB
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \

11
device-shiba.mk
View file

@ -242,6 +242,11 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
else
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
endif
# Location # Location
# SDK build system # SDK build system
@ -268,8 +273,12 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL # Fingerprint HAL
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
else
APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
endif
GOODIX_CONFIG_BUILD_VERSION := g7_trusty 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) $(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)

7
husky/BoardConfig.mk
View file

@ -27,7 +27,12 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_HUSKY_BOOTLOADER_DIR) ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
ifdef PHONE_CAR_BOARD_PRODUCT ifdef PHONE_CAR_BOARD_PRODUCT
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk

6
ripcurrent/BoardConfig.mk
View file

@ -27,6 +27,12 @@ TARGET_SCREEN_DENSITY := 440
BOARD_USES_GENERIC_AUDIO := true BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_SHUSKY := true USES_DEVICE_GOOGLE_SHUSKY := true
ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
include device/google/shusky/device-shusky-common.mk include device/google/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk include device/google/zuma/BoardConfig-common.mk

6
shiba/BoardConfig.mk
View file

@ -27,7 +27,11 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_SHIBA_BOOTLOADER_DIR) ifeq ($(RELEASE_PLATFORM_VERSION),UP1A)
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
else
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
endif
ifdef PHONE_CAR_BOARD_PRODUCT ifdef PHONE_CAR_BOARD_PRODUCT
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk