commit a14f280cb0c5172847e297e7b08f83c80b83f0f7
author Paul Duffin <paulduffin@google.com> Thu Jun 13 00:16:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 00:16:57 2019 -0700
tree effe6c27e5b75f10ac38473a0ea2673ec970358e
parent ee9d72d0c8ac5d03cb43bd783188270596575497
parent e6cb60da57a25f874942b009de897c1f12c8485e

Merge "Allow java_test.go tests to use any Android.bp file" am: 45656aacab
am: e6cb60da57

Change-Id: I0fedcef906e6e59e004115d421df1a152348a02c

java/java_test.go

diff --git a/java/java_test.go b/java/java_test.go
index 1d22dae..f04bbe4 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -212,7 +212,7 @@
 	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)