From baccf7e12240d534767986fff7345d29a5982b7a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 11 Jun 2019 11:58:30 +0100 Subject: [PATCH] Allow java_test.go tests to use any Android.bp file Previously, the tests had to use the Android.bp file in the root directory of the mock file system. That prevented adding tests that are dependent on the location of the Android.bp file, e.g. ones that use no_standard_libs. This change will process any Android.bp in the mock filesystem. Bug: 134566750 Test: m Change-Id: I6fb057a473a18e87bd1a89507e78ceb3fd171eb5 --- java/java_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java_test.go b/java/java_test.go index 4d161c5ac..4c8367bb9 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)