Merge "Extract testDexpreoptWithApexes() for reuse"

This commit is contained in:
Paul Duffin
2020-12-11 10:06:07 +00:00
committed by Gerrit Code Review

View File

@@ -5691,6 +5691,13 @@ func testNoUpdatableJarsInBootImage(t *testing.T, errmsg string, transformDexpre
], ],
} }
` `
testDexpreoptWithApexes(t, bp, errmsg, transformDexpreoptConfig)
}
func testDexpreoptWithApexes(t *testing.T, bp, errmsg string, transformDexpreoptConfig func(*dexpreopt.GlobalConfig)) {
t.Helper()
bp += cc.GatherRequiredDepsForTest(android.Android) bp += cc.GatherRequiredDepsForTest(android.Android)
bp += java.GatherRequiredDepsForTest() bp += java.GatherRequiredDepsForTest()
bp += dexpreopt.BpToolModulesForTest() bp += dexpreopt.BpToolModulesForTest()