summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2019-06-13 00:16:57 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-13 00:16:57 -0700
commita14f280cb0c5172847e297e7b08f83c80b83f0f7 (patch)
treeeffe6c27e5b75f10ac38473a0ea2673ec970358e /java/java_test.go
parentee9d72d0c8ac5d03cb43bd783188270596575497 (diff)
parente6cb60da57a25f874942b009de897c1f12c8485e (diff)
Merge "Allow java_test.go tests to use any Android.bp file" am: 45656aacab
am: e6cb60da57 Change-Id: I0fedcef906e6e59e004115d421df1a152348a02c
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go
index 1d22dae88..f04bbe440 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -212,7 +212,7 @@ func run(t *testing.T, ctx *android.TestContext, config android.Config) {
setDexpreoptTestGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx))
ctx.Register()
- _, errs := ctx.ParseFileList(".", []string{"Android.bp", "prebuilts/sdk/Android.bp"})
+ _, errs := ctx.ParseBlueprintsFiles("Android.bp")
android.FailIfErrored(t, errs)
_, errs = ctx.PrepareBuildActions(config)
android.FailIfErrored(t, errs)