Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c183c75 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Make dexpreopt tools available for all java tests"

parents 65490b8c 635aa083

apex/apex_test.go

+0 −2
Original line number Diff line number Diff line
@@ -5925,7 +5925,6 @@ func testDexpreoptWithApexes(t *testing.T, bp, errmsg string, transformDexpreopt 


	bp += cc.GatherRequiredDepsForTest(android.Android)

	bp += java.GatherRequiredDepsForTest()

	bp += dexpreopt.BpToolModulesForTest()



	fs := map[string][]byte{

		"a.java":                             nil,
@@ -5957,7 +5956,6 @@ func testDexpreoptWithApexes(t *testing.T, bp, errmsg string, transformDexpreopt 


	ctx.Register()



	dexpreopt.RegisterToolModulesForTest(ctx)

	pathCtx := android.PathContextForTesting(config)

	dexpreoptConfig := dexpreopt.GlobalConfigForTests(pathCtx)

	transformDexpreoptConfig(dexpreoptConfig)

dexpreopt/testing.go

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ func dummyToolBinaryFactory() android.Module { 
	return module

}



func RegisterToolModulesForTest(ctx *android.TestContext) {

func RegisterToolModulesForTest(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("dummy_tool_binary", dummyToolBinaryFactory)

}

java/java_test.go

+0 −4
Original line number Diff line number Diff line
@@ -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()

	})

java/testing.go

+6 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 
	RegisterSdkLibraryBuildComponents(ctx)

	RegisterStubsBuildComponents(ctx)

	RegisterSystemModulesBuildComponents(ctx)



	// Make sure that any tool related module types needed by dexpreopt have been registered.

	dexpreopt.RegisterToolModulesForTest(ctx)

}



// Gather the module definitions needed by tests that depend upon code from this package.
@@ -207,6 +210,9 @@ func GatherRequiredDepsForTest() string { 
		`, extra)

	}



	// Make sure that any tools needed for dexpreopting are defined.

	bp += dexpreopt.BpToolModulesForTest()



	// Make sure that the dex_bootjars singleton module is instantiated for the tests.

	bp += `

		dex_bootjars {