|
@@ -50,7 +50,7 @@ var addSourceSystemModules = android.FixtureAddTextFile("source/Android.bp", `
|
|
`)
|
|
`)
|
|
|
|
|
|
func TestJavaSystemModules(t *testing.T) {
|
|
func TestJavaSystemModules(t *testing.T) {
|
|
- result := prepareForJavaTest.RunTest(t, addSourceSystemModules)
|
|
|
|
|
|
+ result := android.GroupFixturePreparers(prepareForJavaTest, addSourceSystemModules).RunTest(t)
|
|
|
|
|
|
// check the existence of the source module
|
|
// check the existence of the source module
|
|
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")
|
|
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")
|
|
@@ -77,7 +77,7 @@ var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp"
|
|
`)
|
|
`)
|
|
|
|
|
|
func TestJavaSystemModulesImport(t *testing.T) {
|
|
func TestJavaSystemModulesImport(t *testing.T) {
|
|
- result := prepareForJavaTest.RunTest(t, addPrebuiltSystemModules)
|
|
|
|
|
|
+ result := android.GroupFixturePreparers(prepareForJavaTest, addPrebuiltSystemModules).RunTest(t)
|
|
|
|
|
|
// check the existence of the renamed prebuilt module
|
|
// check the existence of the renamed prebuilt module
|
|
prebuiltSystemModules := result.ModuleForTests("system-modules", "android_common")
|
|
prebuiltSystemModules := result.ModuleForTests("system-modules", "android_common")
|
|
@@ -89,10 +89,11 @@ func TestJavaSystemModulesImport(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
|
|
func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) {
|
|
- result := prepareForJavaTest.RunTest(t,
|
|
|
|
|
|
+ result := android.GroupFixturePreparers(
|
|
|
|
+ prepareForJavaTest,
|
|
addSourceSystemModules,
|
|
addSourceSystemModules,
|
|
addPrebuiltSystemModules,
|
|
addPrebuiltSystemModules,
|
|
- )
|
|
|
|
|
|
+ ).RunTest(t)
|
|
|
|
|
|
// check the existence of the source module
|
|
// check the existence of the source module
|
|
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")
|
|
sourceSystemModules := result.ModuleForTests("system-modules", "android_common")
|