Skip to content

Commit 2a16b70

Browse files
author
Cyan_Hsieh
committed
Branch bootloader prebuilts for 24Q2 release
Bug: 313350495 Change-Id: I201e622fc82223aeb7c7f30ce452c714f14ebf60
1 parent 9f2d4bf commit 2a16b70

8 files changed

+20
-0
lines changed

‎device-oriole.mk

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ include device/google/gs-common/touch/stm/stm11.mk
4141
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
4242
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
4343
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
44+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
45+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
4446
else
4547
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
4648
endif
@@ -237,6 +239,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
237239
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
238240
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
239241
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
242+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
243+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
240244
else
241245
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
242246
endif

‎device-raven.mk

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ include device/google/gs-common/touch/lsi/lsi.mk
4141
GOODIX_CONFIG_BUILD_VERSION := g6_trusty
4242
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
4343
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q1
44+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
45+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/24Q2
4446
else
4547
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/firmware/fingerprint/trunk
4648
endif
@@ -245,6 +247,8 @@ PRODUCT_PACKAGES += \
245247
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
246248
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
247249
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
250+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
251+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
248252
else
249253
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
250254
endif

‎device-slider.mk

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider
107107
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
108108
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
109109
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
110+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
111+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
110112
else
111113
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
112114
endif

‎device-whitefin.mk

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin
9090
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
9191
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
9292
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q1
93+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
94+
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/24Q2
9395
else
9496
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts/trusty/trunk
9597
endif

‎oriole/BoardConfig.mk

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
2626
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
2727
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
2828
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
29+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
30+
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
2931
else
3032
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
3133
endif

‎raven/BoardConfig.mk

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
2626
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
2727
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
2828
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
29+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
30+
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
2931
else
3032
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
3133
endif

‎slider/BoardConfig.mk

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
1717
TARGET_BOOTLOADER_BOARD_NAME := slider
1818
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
1919
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
20+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
21+
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
2022
else
2123
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
2224
endif

‎whitefin/BoardConfig.mk

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
1717
TARGET_BOOTLOADER_BOARD_NAME := whitefin
1818
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
1919
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
20+
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
21+
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
2022
else
2123
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
2224
endif

0 commit comments

Comments
 (0)