From 5c9e69586343a02ef3276a484eeaef2a866ba7a4 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Sat, 26 Aug 2023 19:10:21 +0300 Subject: [PATCH] reorder PRODUCT_{PACKAGES,COPY_FILES} in device makefile These directives are usually very large and are less interesting than PRODUCT__PROPERTIES, PRODUCT_OVERRIDE_FINGERPRINT variables. Move them to the bottom to improve readability. --- src/build/make.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/build/make.ts b/src/build/make.ts index 08de098..c285477 100644 --- a/src/build/make.ts +++ b/src/build/make.ts @@ -189,8 +189,6 @@ export function serializeDeviceMakefile(mk: DeviceMakefile) { let blocks = startBlocks() addContBlock(blocks, 'PRODUCT_SOONG_NAMESPACES', mk.namespaces) - addContBlock(blocks, 'PRODUCT_COPY_FILES', mk.copyFiles) - addContBlock(blocks, 'PRODUCT_PACKAGES', mk.packages) if (mk.vintfManifestPaths != undefined) { for (let [partition, manifestPath] of mk.vintfManifestPaths.entries()) { @@ -219,6 +217,9 @@ export function serializeDeviceMakefile(mk: DeviceMakefile) { blocks.push(`PRODUCT_ENFORCE_RRO_TARGETS := ${mk.enforceRros}`) } + addContBlock(blocks, 'PRODUCT_PACKAGES', mk.packages) + addContBlock(blocks, 'PRODUCT_COPY_FILES', mk.copyFiles) + return finishBlocks(blocks) }