openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Java build components require android build components"

This commit is contained in:
Paul Duffin 2021-03-21 11:06:33 +00:00 committed by Gerrit Code Review
parent f2be52c4dc ce5a4547bb
commit d5deba1126
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/testing.go
View File

@ -39,12 +39,15 @@ const defaultJavaDir = "default/java"
// module types as possible. The exceptions are those module types that require mutators and/or // 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 // singletons in order to function in which case they should be kept together in a separate
// preparer. // 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. // Test fixture preparer that will define default java modules, e.g. standard prebuilt modules.
var PrepareForTestWithJavaDefaultModules = android.GroupFixturePreparers( 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. // Make sure that all the module types used in the defaults are registered.
PrepareForTestWithJavaBuildComponents, PrepareForTestWithJavaBuildComponents,
// The java default module definitions. // The java default module definitions.