commit d3e141de80cff56fab9cadef83199030647b4d78
author Jeff Gaston <jeffrygaston@google.com> Tue Aug 08 17:46:01 2017 -0700
committer Jeff Gaston <jeffrygaston@google.com> Wed Nov 08 23:48:44 2017 +0000
tree a0d8d8585446ea47fda57129609553a44e9374f9
parent 94cc5662c4ca95d9b3174516a8b9af2ecd6da756

Pass results of Finder into Blueprint

Bug: 64363847
Test: m -j

Change-Id: I79db8c524af6e77c35a0199ec1876e5eb94e8971

cc/cc_test.go

diff --git a/cc/cc_test.go b/cc/cc_test.go
index 14b4245..32cffe4 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -116,7 +116,7 @@
 		"bar.c":      nil,
 	})
 
-	_, errs := ctx.ParseBlueprintsFiles("Android.bp")
+	_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
 	failIfErrored(t, errs)
 	_, errs = ctx.PrepareBuildActions(config)
 	failIfErrored(t, errs)

java/java_test.go

diff --git a/java/java_test.go b/java/java_test.go
index 82eff1e..e1c90ee 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -134,7 +134,7 @@
 		"prebuilts/sdk/test_current/framework.aidl":   nil,
 	})
 
-	_, errs := ctx.ParseBlueprintsFiles("Android.bp")
+	_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
 	fail(t, errs)
 	_, errs = ctx.PrepareBuildActions(config)
 	fail(t, errs)

ui/build/soong.go

diff --git a/ui/build/soong.go b/ui/build/soong.go
index d3bcf87..6dafd27 100644
--- a/ui/build/soong.go
+++ b/ui/build/soong.go
@@ -36,6 +36,7 @@
 		cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash")
 		cmd.Environment.Set("BUILDDIR", config.SoongOutDir())
 		cmd.Environment.Set("GOROOT", filepath.Join("./prebuilts/go", config.HostPrebuiltTag()))
+		cmd.Environment.Set("BLUEPRINT_LIST_FILE", filepath.Join(config.FileListDir(), "Android.bp.list"))
 		cmd.Environment.Set("NINJA_BUILDDIR", config.OutDir())
 		cmd.Environment.Set("SRCDIR", ".")
 		cmd.Environment.Set("TOPNAME", "Android.bp")