diff options
Diffstat (limited to 'java/system_modules_test.go')
| -rw-r--r-- | java/system_modules_test.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/java/system_modules_test.go b/java/system_modules_test.go index 7d8935a4d..120bbf7f5 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -20,12 +20,12 @@ import ( "android/soong/android" ) -func getModuleHeaderJarsAsNormalizedPaths(result *android.TestResult, moduleNames ...string) []string { +func getModuleHeaderJarsAsRelativeToTopPaths(result *android.TestResult, moduleNames ...string) []string { paths := []string{} for _, moduleName := range moduleNames { module := result.Module(moduleName, "android_common") info := result.ModuleProvider(module, JavaInfoProvider).(JavaInfo) - paths = append(paths, result.NormalizePathsForTesting(info.HeaderJars)...) + paths = append(paths, info.HeaderJars.RelativeToTop().Strings()...) } return paths } @@ -57,8 +57,8 @@ func TestJavaSystemModules(t *testing.T) { sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs // The expected paths are the header jars from the source input modules. - expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) + expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2") + android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings()) } var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp", ` @@ -84,8 +84,8 @@ func TestJavaSystemModulesImport(t *testing.T) { prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs // The expected paths are the header jars from the renamed prebuilt input modules. - expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) + expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2") + android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings()) } func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { @@ -99,14 +99,14 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { sourceInputs := sourceSystemModules.Rule("jarsTosystemModules").Inputs // The expected paths are the header jars from the source input modules. - expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) + expectedSourcePaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "system-module1", "system-module2") + android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, sourceInputs.RelativeToTop().Strings()) // check the existence of the renamed prebuilt module prebuiltSystemModules := result.ModuleForTests("prebuilt_system-modules", "android_common") prebuiltInputs := prebuiltSystemModules.Rule("jarsTosystemModules").Inputs // The expected paths are the header jars from the renamed prebuilt input modules. - expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "prebuilt_system-module1", "prebuilt_system-module2") - android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) + expectedPrebuiltPaths := getModuleHeaderJarsAsRelativeToTopPaths(result, "prebuilt_system-module1", "prebuilt_system-module2") + android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, prebuiltInputs.RelativeToTop().Strings()) } |