From ce5a4547bb9ba57fb3f02f5e4113fa6d4d42286b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 15 Mar 2021 12:17:54 +0000 Subject: [PATCH] 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 --- java/testing.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java/testing.go b/java/testing.go index 6fc3b0396..4b8b84924 100644 --- a/java/testing.go +++ b/java/testing.go @@ -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.