diff options
| author | 2017-11-09 03:07:36 +0000 | |
|---|---|---|
| committer | 2017-11-09 03:07:36 +0000 | |
| commit | 99a5635733d45b30e4b38770e52243f3c46dac1e (patch) | |
| tree | c4414c053c1f6b476fa8f45849ce16f344b74991 | |
| parent | 1fa3ac552d3c55204520afad992280461f717228 (diff) | |
| parent | d3e141de80cff56fab9cadef83199030647b4d78 (diff) | |
Merge "Pass results of Finder into Blueprint"
| -rw-r--r-- | cc/cc_test.go | 2 | ||||
| -rw-r--r-- | java/java_test.go | 2 | ||||
| -rw-r--r-- | ui/build/soong.go | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cc/cc_test.go b/cc/cc_test.go index 14b424562..32cffe4e0 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -116,7 +116,7 @@ func testCc(t *testing.T, bp string) *android.TestContext { "bar.c": nil, }) - _, errs := ctx.ParseBlueprintsFiles("Android.bp") + _, errs := ctx.ParseFileList(".", []string{"Android.bp"}) failIfErrored(t, errs) _, errs = ctx.PrepareBuildActions(config) failIfErrored(t, errs) diff --git a/java/java_test.go b/java/java_test.go index 82eff1e93..e1c90ee13 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -134,7 +134,7 @@ func testJavaWithEnv(t *testing.T, bp string, env map[string]string) *android.Te "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) diff --git a/ui/build/soong.go b/ui/build/soong.go index d3bcf876b..6dafd273c 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -36,6 +36,7 @@ func runSoong(ctx Context, config Config) { 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") |