StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Subsume INTEGRATED_BP2BUILD into other env modes"

Browse Source
This commit is contained in:
Christopher Parsons
2021-04-20 23:33:40 +00:00
committed by Gerrit Code Review
parent cbb3825d86 ec1a3dc6f8
commit 4e78814200
5 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/soong_build/main.go
View File

@@ -175,7 +175,7 @@ func writeJsonModuleGraph(configuration android.Config, ctx *android.Context, pa
}
func doChosenActivity(configuration android.Config, extraNinjaDeps []string) string {
bazelConversionRequested := configuration.IsEnvTrue("GENERATE_BAZEL_FILES") || bp2buildMarker != ""
bazelConversionRequested := bp2buildMarker != ""
mixedModeBuild := configuration.BazelContext.BazelEnabled()
generateQueryView := bazelQueryViewDir != ""
jsonModuleFile := configuration.Getenv("SOONG_DUMP_JSON_MODULE_GRAPH")