commit 6c968b1f0fc2818f75292820c8146763277973af
author Paul Duffin <paulduffin@google.com> Thu Mar 25 18:02:26 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 25 18:02:26 2021 +0000
tree d64cd3cc745834e143324921d8de9accb44a6c3c
parent 301deecd6c55879882429129b98c60628ce6a9ab
parent 4dd6cdb3bce897e074d31cd2ea8ed4114a46e625

Merge "Fix TestDroiddoc's reliance on absolute paths"

java/java_test.go

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)
 	}