Merge "aidl: -ninja -> --ninja"
diff --git a/ui/build/build.go b/ui/build/build.go
index 66dbf03..acba275 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -40,7 +40,6 @@
{{if .HasKatiSuffix}}include {{.KatiNinjaFile}}
{{end -}}
include {{.SoongNinjaFile}}
-build {{.CombinedNinjaFile}}: phony {{.SoongNinjaFile}}
`))
func createCombinedBuildNinjaFile(ctx Context, config Config) {
diff --git a/ui/build/soong.go b/ui/build/soong.go
index cbb75c7..a73082a 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -71,21 +71,31 @@
}
}()
+ var cfg microfactory.Config
+ cfg.Map("github.com/google/blueprint", "build/blueprint")
+
+ cfg.TrimPath = absPath(ctx, ".")
+
func() {
ctx.BeginTrace("minibp")
defer ctx.EndTrace()
- var cfg microfactory.Config
- cfg.Map("github.com/google/blueprint", "build/blueprint")
-
- cfg.TrimPath = absPath(ctx, ".")
-
minibp := filepath.Join(config.SoongOutDir(), ".minibootstrap/minibp")
if _, err := microfactory.Build(&cfg, minibp, "github.com/google/blueprint/bootstrap/minibp"); err != nil {
ctx.Fatalln("Failed to build minibp:", err)
}
}()
+ func() {
+ ctx.BeginTrace("bpglob")
+ defer ctx.EndTrace()
+
+ bpglob := filepath.Join(config.SoongOutDir(), ".minibootstrap/bpglob")
+ if _, err := microfactory.Build(&cfg, bpglob, "github.com/google/blueprint/bootstrap/bpglob"); err != nil {
+ ctx.Fatalln("Failed to build bpglob:", err)
+ }
+ }()
+
ninja := func(name, file string) {
ctx.BeginTrace(name)
defer ctx.EndTrace()