From 29453cb42e020e566e9306e56b102b3c55213975 Mon Sep 17 00:00:00 2001 From: Dmitry Muhomor Date: Thu, 7 Dec 2023 03:40:13 +0200 Subject: [PATCH] bugfix: generatePrep() didn't clear extra_product_makefiles generatePrep() is called from the `collect-state --rebuild` command, which uses a different codepath than the `generate-prep` command. --- src/commands/generate-prep.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commands/generate-prep.ts b/src/commands/generate-prep.ts index 6661b6f..732d431 100644 --- a/src/commands/generate-prep.ts +++ b/src/commands/generate-prep.ts @@ -30,6 +30,10 @@ const doDevice = ( useTemp: boolean, ) => withTempDir(async tmp => { + // these makefiles are expected to reference proprietary files that are + // inaccessible during state collection build + config.platform.extra_product_makefiles = [] + // Prepare stock system source let wrapBuildId = buildId == undefined ? null : buildId let wrapped = await withSpinner('Extracting stock system source', spinner => @@ -127,10 +131,6 @@ export default class GeneratePrep extends Command { buildId = flags.buildId } - // these makefiles are expected to reference proprietary files that are - // inaccessible during state collection build - config.platform.extra_product_makefiles = [] - await doDevice(config, stockSrc, buildId, flags.skipCopy, flags.useTemp) }, config => config.device.name,