From 3ba38abf51c6c8977076569f8a9c1458ece36400 Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Wed, 1 May 2024 18:58:06 +0800 Subject: [PATCH 1/3] Update bootloader pdk folder and soong config Bug: 333834221 Change-Id: I410f06023eabfad6a89a347833acbb90735e99d1 --- husky/BoardConfig.mk | 4 ++-- ripcurrent/BoardConfig.mk | 4 ++-- shiba/BoardConfig.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index ff42cae..21dcb5a 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -27,9 +27,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 diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index f7ec3e1..76f2b5d 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/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 diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 81a69e0..d5b5fc8 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -27,9 +27,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 From fab6a485f9ed2e3b4fc1fcf51d951443a6ac095f Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 14 May 2024 23:58:02 +0000 Subject: [PATCH 2/3] 16kb: Use RELEASE_KERNEL_SHIBA_DIR for shiba targets Test: Built locally Bug: 333734531 Bug: 308663811 Change-Id: I6190bd55ac2e7007df4f6cab5b64a0666e0a0314 --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index b7f3371..9a77be8 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -28,7 +28,7 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false ifeq ($(DEVICE_PAGE_AGNOSTIC),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) From d83a4ff79ba20d29af11f8873272029e45c96956 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Tue, 14 May 2024 23:31:43 +0000 Subject: [PATCH 3/3] 16kb: Set ext4 filesystem for data/metadata partition in pgagnostic targets Test: Built shusky agnostic target Bug: 333734531 Bug: 308663811 Change-Id: Ia14228aec87eefffd04c96a408e80bd8d3c344a1 --- device-husky.mk | 1 + device-shiba.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index dbf08ce..baa151b 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -36,6 +36,7 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false ifeq ($(DEVICE_PAGE_AGNOSTIC),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +TARGET_RW_FILE_SYSTEM_TYPE := ext4 endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) diff --git a/device-shiba.mk b/device-shiba.mk index 9a77be8..bc95cb8 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -29,6 +29,7 @@ DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false ifeq ($(DEVICE_PAGE_AGNOSTIC),true) TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb +TARGET_RW_FILE_SYSTEM_TYPE := ext4 endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)