commit e6cb60da57a25f874942b009de897c1f12c8485e
author Paul Duffin <paulduffin@google.com> Thu Jun 13 00:11:59 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 00:11:59 2019 -0700
tree 60390d5e7e36bb12ae6e55f98300272e5df32d64
parent c0646044396752b70018e335f497b9834a208234
parent 45656aacab4012c6873dfbb27e91904f10f5d301

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

Change-Id: I087cf543b7bc534e39b40f9e06e13a15487af109

java/java_test.go

diff --git a/java/java_test.go b/java/java_test.go
index 4d161c5..4c8367b 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)