From ff79f64a6e524b28544fefc13dcecc12def27001 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Mon, 13 Dec 2021 19:03:03 -0800 Subject: [PATCH] build: make: Separate built and A/B OTA partitions --- src/build/make.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/build/make.ts b/src/build/make.ts index 89ea647..10f7c47 100644 --- a/src/build/make.ts +++ b/src/build/make.ts @@ -37,6 +37,7 @@ export interface ModulesMakefile { } export interface BoardMakefile { + buildPartitions?: Array abOtaPartitions?: Array boardInfo?: string @@ -143,17 +144,17 @@ export function serializeBoardMakefile(mk: BoardMakefile) { blocks.push('BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true') // Build vendor? - if (mk.abOtaPartitions?.includes('vendor')) { + if (mk.buildPartitions?.includes('vendor')) { blocks.push('BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4') } // Build DLKM partitions? - if (mk.abOtaPartitions?.includes('vendor_dlkm')) { + if (mk.buildPartitions?.includes('vendor_dlkm')) { blocks.push(`BOARD_USES_VENDOR_DLKMIMAGE := true BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm`) } - if (mk.abOtaPartitions?.includes('odm_dlkm')) { + if (mk.buildPartitions?.includes('odm_dlkm')) { blocks.push(`BOARD_USES_ODM_DLKIMAGE := true BOARD_ODM_DLKIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_ODM_DLKM := odm_dlkm`)