Blaster4385/adevtool
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reorder PRODUCT_{PACKAGES,COPY_FILES} in device makefile

Browse source 
These directives are usually very large and are less interesting than PRODUCT_<partition>_PROPERTIES,
PRODUCT_OVERRIDE_FINGERPRINT variables. Move them to the bottom to improve readability.
This commit is contained in:
Dmitry Muhomor 2023-08-26 19:10:21 +03:00 committed by Daniel Micay
parent 2aaa970886
commit 5c9e695863
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/build/make.ts
View file

@ -189,8 +189,6 @@ export function serializeDeviceMakefile(mk: DeviceMakefile) {
let blocks = startBlocks() let blocks = startBlocks()
addContBlock(blocks, 'PRODUCT_SOONG_NAMESPACES', mk.namespaces) addContBlock(blocks, 'PRODUCT_SOONG_NAMESPACES', mk.namespaces)
addContBlock(blocks, 'PRODUCT_COPY_FILES', mk.copyFiles)
addContBlock(blocks, 'PRODUCT_PACKAGES', mk.packages)
if (mk.vintfManifestPaths != undefined) { if (mk.vintfManifestPaths != undefined) {
for (let [partition, manifestPath] of mk.vintfManifestPaths.entries()) { 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}`) blocks.push(`PRODUCT_ENFORCE_RRO_TARGETS := ${mk.enforceRros}`)
} }
addContBlock(blocks, 'PRODUCT_PACKAGES', mk.packages)
addContBlock(blocks, 'PRODUCT_COPY_FILES', mk.copyFiles)
return finishBlocks(blocks) return finishBlocks(blocks)
} }