tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Skip cloning modules in bp2build" am: 511e1d0b77

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2623059

Change-Id: I0e6f759e4bccaf61fcfb763b9aa2303934b23890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-14 03:18:51 +00:00 committed by Automerger Merge Worker
commit 37d05f47aa
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/soong_build/main.go
View file

@ -817,6 +817,9 @@ func runBp2Build(ctx *android.Context, extraNinjaDeps []string, metricsDir strin
ctx.SetNameInterface(newNameResolver(ctx.Config())) ctx.SetNameInterface(newNameResolver(ctx.Config()))
ctx.RegisterForBazelConversion() ctx.RegisterForBazelConversion()
ctx.SetModuleListFile(cmdlineArgs.ModuleListFile) ctx.SetModuleListFile(cmdlineArgs.ModuleListFile)
// Skip cloning modules during bp2build's blueprint run. Some mutators set
// bp2build-related module values which should be preserved during codegen.
ctx.SkipCloneModulesAfterMutators = true
var ninjaDeps []string var ninjaDeps []string
ninjaDeps = append(ninjaDeps, extraNinjaDeps...) ninjaDeps = append(ninjaDeps, extraNinjaDeps...)