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

Commit ce5a4547 authored by Paul Duffin's avatar Paul Duffin
Browse files

Java build components require android build components 

Java build components invariably require android build components such
as the arch mutator (to create the common variant) so include them
together.

Bug: 181070625
Test: m nothing
Change-Id: I435b09a34c48c67b890368b37b8da27e8de97c9a
parent 03878621

java/testing.go

+6 −3
Original line number Diff line number Diff line
@@ -39,12 +39,15 @@ const defaultJavaDir = "default/java" 
// module types as possible. The exceptions are those module types that require mutators and/or

// singletons in order to function in which case they should be kept together in a separate

// preparer.

var PrepareForTestWithJavaBuildComponents = android.FixtureRegisterWithContext(RegisterRequiredBuildComponentsForTest)

var PrepareForTestWithJavaBuildComponents = android.GroupFixturePreparers(

	// Make sure that mutators and module types, e.g. prebuilt mutators available.

	android.PrepareForTestWithAndroidBuildComponents,

	// Make java build components available to the test.

	android.FixtureRegisterWithContext(RegisterRequiredBuildComponentsForTest),

)



// Test fixture preparer that will define default java modules, e.g. standard prebuilt modules.

var PrepareForTestWithJavaDefaultModules = android.GroupFixturePreparers(

	// Make sure that mutators and module types, e.g. prebuilt mutators available.

	android.PrepareForTestWithAndroidBuildComponents,

	// Make sure that all the module types used in the defaults are registered.

	PrepareForTestWithJavaBuildComponents,

	// The java default module definitions.