Split bootloader prebuilt to 24Q1 and trunk version
Bug: 299879102 Change-Id: I6ba0748b82770025f585d79b8d7aba281391e38d
This commit is contained in:
parent
9277116535
commit
3cc2927e27
8 changed files with 45 additions and 2 deletions
|
@ -18,7 +18,11 @@
|
||||||
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_CHEETAH_BOOTLOADER_DIR)
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||||
|
else
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||||
|
endif
|
||||||
|
|
||||||
# The modules which need to be loaded in sequential
|
# The modules which need to be loaded in sequential
|
||||||
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
#
|
#
|
||||||
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
||||||
TARGET_BOOTLOADER_BOARD_NAME := cloudripper
|
TARGET_BOOTLOADER_BOARD_NAME := cloudripper
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||||
|
else
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||||
|
endif
|
||||||
TARGET_SCREEN_DENSITY := 440
|
TARGET_SCREEN_DENSITY := 440
|
||||||
BOARD_USES_GENERIC_AUDIO := true
|
BOARD_USES_GENERIC_AUDIO := true
|
||||||
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
||||||
|
|
|
@ -289,6 +289,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
|
||||||
|
|
||||||
# Trusty liboemcrypto.so
|
# Trusty liboemcrypto.so
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
|
||||||
|
else
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
|
||||||
|
endif
|
||||||
|
|
||||||
# Location
|
# Location
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
|
|
@ -155,6 +155,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
|
||||||
|
|
||||||
# Trusty liboemcrypto.so
|
# Trusty liboemcrypto.so
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
|
||||||
|
else
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
|
||||||
|
endif
|
||||||
|
|
||||||
# Location
|
# Location
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
|
|
@ -273,6 +273,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/
|
||||||
|
|
||||||
# Trusty liboemcrypto.so
|
# Trusty liboemcrypto.so
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
|
||||||
|
else
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
|
||||||
|
endif
|
||||||
|
|
||||||
# Location
|
# Location
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
|
|
@ -145,6 +145,11 @@ PRODUCT_SOONG_NAMESPACES += \
|
||||||
|
|
||||||
# Fingerprint HAL
|
# Fingerprint HAL
|
||||||
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
|
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/24Q1
|
||||||
|
else
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/firmware/fingerprint/trunk
|
||||||
|
endif
|
||||||
$(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)
|
||||||
|
@ -161,6 +166,11 @@ PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/
|
||||||
|
|
||||||
# Trusty liboemcrypto.so
|
# Trusty liboemcrypto.so
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/24Q1
|
||||||
|
else
|
||||||
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts/trusty/trunk
|
||||||
|
endif
|
||||||
|
|
||||||
# Location
|
# Location
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
|
|
@ -21,7 +21,11 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
||||||
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := $(RELEASE_GOOGLE_PANTHER_BOOTLOADER_DIR)
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
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 device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||||
|
|
|
@ -15,6 +15,11 @@
|
||||||
#
|
#
|
||||||
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
||||||
TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
|
TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
|
||||||
|
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
||||||
|
else
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
||||||
|
endif
|
||||||
TARGET_SCREEN_DENSITY := 560
|
TARGET_SCREEN_DENSITY := 560
|
||||||
BOARD_USES_GENERIC_AUDIO := true
|
BOARD_USES_GENERIC_AUDIO := true
|
||||||
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue