From 635aa0834f657282c0dd74c23d83e31e6003f6bd Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 25 Jan 2021 19:11:24 +0000 Subject: Make dexpreopt tools available for all java tests Bug: 177892522 Test: m nothing Change-Id: I594bddae692ef76dc8c3da504934d0151b13d4c9 --- java/java_test.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index 7b8984810..e7776c35d 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -59,8 +59,6 @@ func TestMain(m *testing.M) { } func testConfig(env map[string]string, bp string, fs map[string][]byte) android.Config { - bp += dexpreopt.BpToolModulesForTest() - return TestConfig(buildDir, env, bp, fs) } @@ -84,8 +82,6 @@ func testContext(config android.Config) *android.TestContext { // Register module types and mutators from cc needed for JNI testing cc.RegisterRequiredBuildComponentsForTest(ctx) - dexpreopt.RegisterToolModulesForTest(ctx) - ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) { ctx.TopDown("propagate_rro_enforcement", propagateRROEnforcementMutator).Parallel() }) -- cgit v1.2.3-59-g8ed1b