StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow java_test.go tests to use any Android.bp file"

Browse Source 
am: 45656aacab

Change-Id: I087cf543b7bc534e39b40f9e06e13a15487af109
This commit is contained in:
Paul Duffin
2019-06-13 00:11:59 -07:00
committed by android-build-merger
parent c064604439 45656aacab
commit e6cb60da57
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java_test.go
View File

@@ -212,7 +212,7 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) {
setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx)) setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx))
ctx.Register() ctx.Register()
_, errs := ctx.ParseFileList(".", []string{"Android.bp", "prebuilts/sdk/Android.bp"}) _, errs := ctx.ParseBlueprintsFiles("Android.bp")
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)