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 "Pass results of Finder into Blueprint" am: 99a5635733 

am: 01452934fb

Change-Id: I975717dfc1e3f8d7a7a1417d53ae957acdf7c629
This commit is contained in:
Jeff Gaston 2017-11-09 03:14:30 +00:00 committed by android-build-merger
parent 3caa24c44c 01452934fb
commit 8babc15d24
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc_test.go
View File

@ -116,7 +116,7 @@ func testCc(t *testing.T, bp string) *android.TestContext {
"bar.c": nil, "bar.c": nil,
}) })
_, errs := ctx.ParseBlueprintsFiles("Android.bp") _, errs := ctx.ParseFileList(".", []string{"Android.bp"})
failIfErrored(t, errs) failIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
failIfErrored(t, errs) failIfErrored(t, errs)

2
java/java_test.go
View File

@ -134,7 +134,7 @@ func testJavaWithEnv(t *testing.T, bp string, env map[string]string) *android.Te
"prebuilts/sdk/test_current/framework.aidl": nil, "prebuilts/sdk/test_current/framework.aidl": nil,
}) })
_, errs := ctx.ParseBlueprintsFiles("Android.bp") _, errs := ctx.ParseFileList(".", []string{"Android.bp"})
fail(t, errs) fail(t, errs)
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
fail(t, errs) fail(t, errs)

1
ui/build/soong.go
View File

@ -36,6 +36,7 @@ func runSoong(ctx Context, config Config) {
cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash") cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash")
cmd.Environment.Set("BUILDDIR", config.SoongOutDir()) cmd.Environment.Set("BUILDDIR", config.SoongOutDir())
cmd.Environment.Set("GOROOT", filepath.Join("./prebuilts/go", config.HostPrebuiltTag())) 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("NINJA_BUILDDIR", config.OutDir())
cmd.Environment.Set("SRCDIR", ".") cmd.Environment.Set("SRCDIR", ".")
cmd.Environment.Set("TOPNAME", "Android.bp") cmd.Environment.Set("TOPNAME", "Android.bp")