commit e8366da1f61cbff804cefe3b69f6293b4bad0c98
author Paul Duffin <paulduffin@google.com> Wed Mar 24 10:40:38 2021 +0000
committer Paul Duffin <paulduffin@google.com> Tue Mar 30 19:35:35 2021 +0100
tree 34b781c8f22d8f72d2592147037baf7309c9cfad
parent b2786a3fdc36cb87c5ef5a9b4940cacffc0a90f2

Automatically call TestingBuildParams.RelativeToTop()

Fixes the few tests that break due to this and which cannot easily be
separated into their own changes.

Bug: 183650682
Test: m nothing
Change-Id: Ia2f31213a1f114a78e66a81d89279ecde9f4c465

cc/proto_test.go

diff --git a/cc/proto_test.go b/cc/proto_test.go
index f8bbd26..3d636fb 100644
--- a/cc/proto_test.go
+++ b/cc/proto_test.go
@@ -61,7 +61,7 @@
 			t.Errorf("expected %q in %q", w, cmd)
 		}
 
-		foobarPath := foobar.Module().(android.HostToolProvider).HostToolPath().String()
+		foobarPath := foobar.Module().(android.HostToolProvider).HostToolPath().RelativeToPath().String()
 
 		if w := "--plugin=protoc-gen-foobar=" + foobarPath; !strings.Contains(cmd, w) {
 			t.Errorf("expected %q in %q", w, cmd)