Merge "Update bootloader pdk folder and soong config" into main
This commit is contained in:
commit
b754c345ff
3 changed files with 6 additions and 6 deletions
|
@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky
|
|||
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
|
||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||
RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
|
||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
|
||||
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
|
||||
|
||||
ifdef PHONE_CAR_BOARD_PRODUCT
|
||||
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||
|
|
|
@ -27,9 +27,9 @@ TARGET_SCREEN_DENSITY := 440
|
|||
BOARD_USES_GENERIC_AUDIO := true
|
||||
USES_DEVICE_GOOGLE_SHUSKY := true
|
||||
|
||||
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
|
||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
|
||||
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
|
||||
|
||||
include device/google/shusky/device-shusky-common.mk
|
||||
|
||||
|
|
|
@ -28,9 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba
|
|||
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
|
||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
|
||||
RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
|
||||
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
|
||||
$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
|
||||
|
||||
ifdef PHONE_CAR_BOARD_PRODUCT
|
||||
include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue