commit 511e1d0b774e19cabcfa976dda1ba456a61065ed
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 14 02:44:42 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 14 02:44:42 2023 +0000
tree 6d3caa78c7c796fdcc65dbbdf6c7605f26f5d943
parent 4397c9fa51ae07f6e6227a624b6f494d8ddecdf6
parent 3a5c17058443b4874f450bd0745749da3de25e61

Merge "Skip cloning modules in bp2build"

cmd/soong_build/main.go

diff --git a/cmd/soong_build/main.go b/cmd/soong_build/main.go
index e903c0a..d2eadba 100644
--- a/cmd/soong_build/main.go
+++ b/cmd/soong_build/main.go
@@ -817,6 +817,9 @@
 		ctx.SetNameInterface(newNameResolver(ctx.Config()))
 		ctx.RegisterForBazelConversion()
 		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
 		ninjaDeps = append(ninjaDeps, extraNinjaDeps...)