From d8e6c573fcec84871ef735069ee3326b5ec1c414 Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Tue, 21 May 2024 21:54:17 +0000 Subject: [PATCH 1/3] Move boot_otas to /vendor Test: Boot device and use developer options. Test: $ adb shell ls -l /vendor/boot_otas/ total 11712 -rw-r--r-- 1 root root 5980771 2024-05-21 17:36 boot_ota_16k.zip -rw-r--r-- 1 root root 6007912 2024-05-21 17:36 boot_ota_4k.zip Bug: 295035851 Bug: 318887939 Change-Id: I15a225aaa068a9a215d9aadc9c7b0e5f16edbc53 --- BoardConfig-shusky-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk index d23edb3..f2ede26 100644 --- a/BoardConfig-shusky-common.mk +++ b/BoardConfig-shusky-common.mk @@ -29,4 +29,5 @@ BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) BOARD_16K_OTA_USE_INCREMENTAL := true +BOARD_16K_OTA_MOVE_VENDOR := true endif \ No newline at end of file From b91082483f59b784f31002abca7593f092cc65d6 Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Thu, 23 May 2024 20:25:17 +0000 Subject: [PATCH 2/3] Use husky specific flag for dev options Husky and shiba might use different kernels moving forward and dev options should be controlled by separate flags on husky and shiba. Test: Build husky-trunk_staging-userdebug Bug: 342011434 Change-Id: I8c855c95d99e4e4b3f2233179f368bcbb63a9720 --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 1599407..62608e8 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -38,7 +38,7 @@ TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb TARGET_RW_FILE_SYSTEM_TYPE := ext4 else -PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) +PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) From c7b8d16d38b948bb22750c8e67eaa2694d417592 Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Thu, 23 May 2024 23:47:40 +0000 Subject: [PATCH 3/3] 16k: shusky: Remove developer option from AOSP pgagnostic targets Page agnostic (16k targets) are already supposed to boot up with 16k page size kernels. Hence, the developer option is not required. Bug: 340969437 Test: Tested `aosp_shiba_pgagnostic` on internal branch to ensure the build succeeds and device boots up. Change-Id: I9fd4011d868f282364c1dedc048531ca2a32c843 --- aosp_husky_pgagnostic.mk | 1 - aosp_shiba_pgagnostic.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index c005922..00ac252 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -20,7 +20,6 @@ PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 -PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 91a9992..40f0a48 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -20,7 +20,6 @@ PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 -PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4