Merge "Extract testDexpreoptWithApexes() for reuse" am: 4d934af2ee am: 30642ff255

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib745536acb0a80bfd4f5ba9492eeae942908132c
This commit is contained in:
Paul Duffin 2020-12-11 11:15:25 +00:00 committed by Automerger Merge Worker
commit 92f5559fb5

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()