Commit baccf7e1 authored Jun 11, 2019 by Paul Duffin

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

parent fad79800

java/java_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)