Merge "Fix TestDroiddoc's reliance on absolute paths"
diff --git a/java/java_test.go b/java/java_test.go
index 9924be7..13b3e2a 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -1429,7 +1429,7 @@
barStubsOutput := barStubsOutputs[0]
barDoc := ctx.ModuleForTests("bar-doc", "android_common")
javaDoc := barDoc.Rule("javadoc").RelativeToTop()
- if g, w := javaDoc.Implicits.Strings(), barStubsOutput.String(); !inList(w, g) {
+ if g, w := android.PathsRelativeToTop(javaDoc.Implicits), android.PathRelativeToTop(barStubsOutput); !inList(w, g) {
t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)
}
@@ -1439,7 +1439,7 @@
}
aidl := barDoc.Rule("aidl")
- if g, w := javaDoc.Implicits.Strings(), aidl.Output.String(); !inList(w, g) {
+ if g, w := android.PathsRelativeToTop(javaDoc.Implicits), android.PathRelativeToTop(aidl.Output); !inList(w, g) {
t.Errorf("implicits of bar-doc must contain %q, but was %q.", w, g)
}