openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Update for sharded globs" am: 14d09018eb am: e5af8f5c6b 

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

Change-Id: Ib6b0dc0ff2a2cbeabf5598aa9cc8f8da4ad91b5a
This commit is contained in:
Colin Cross 2021-04-20 16:51:28 +00:00 committed by Automerger Merge Worker
parent 71e3b0894b e5af8f5c6b
commit 50db016173
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/soong_build/main.go
View File

@ -25,6 +25,7 @@ import (
"android/soong/bp2build"
"android/soong/shared"
"github.com/google/blueprint/bootstrap"
"github.com/google/blueprint/deptools"
@ -392,9 +393,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
ninjaDeps := bootstrap.RunBlueprint(blueprintArgs, bp2buildCtx.Context, configuration)
ninjaDeps = append(ninjaDeps, extraNinjaDeps...)
for _, globPath := range bp2buildCtx.Globs() {
ninjaDeps = append(ninjaDeps, globPath.FileListFile(configuration.BuildDir()))
}
ninjaDeps = append(ninjaDeps, bootstrap.GlobFileListFiles(configuration)...)
// Run the code-generation phase to convert BazelTargetModules to BUILD files
// and print conversion metrics to the user.

2
tests/bootstrap_test.sh
View File

@ -140,7 +140,7 @@ EOF
run_soong
local ninja_mtime1=$(stat -c "%y" out/soong/build.ninja)
local glob_deps_file=out/soong/.glob/a/__py.glob.d
local glob_deps_file=out/soong/.primary/globs/0.d
if [ -e "$glob_deps_file" ]; then
fail "Glob deps file unexpectedly written on first build"