Merge "Fix testDexpreoptBoot to work without javaMockFS()" am: 64df56def9 am: a5807d2dfb

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634636

Change-Id: I2872821a77332630cb0c6c9d96bf2644b1d2874c
This commit is contained in:
Paul Duffin
2021-03-19 12:05:57 +00:00
committed by Automerger Merge Worker

View File

@@ -44,8 +44,11 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu
` `
result := javaFixtureFactory. result := javaFixtureFactory.
Extend(dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar", "platform:baz")). Extend(
RunTestWithBp(t, bp) PrepareForTestWithJavaSdkLibraryFiles,
FixtureWithLastReleaseApis("foo"),
dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar", "platform:baz"),
).RunTestWithBp(t, bp)
dexpreoptBootJars := result.SingletonForTests("dex_bootjars") dexpreoptBootJars := result.SingletonForTests("dex_bootjars")
rule := dexpreoptBootJars.Output(ruleFile) rule := dexpreoptBootJars.Output(ruleFile)