Merge changes If90975c8,I2a873fc6 am: 570e18ffaa am: e4b293ebee

am: 766a3d52d7

Change-Id: I5e3318688695d69ce4b953f22ec7c5da65d89fea

1 files changed, 22 insertions, 0 deletions

diff --git a/android/paths.go b/android/paths.go
index 75e5980e..0d26dc02 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -721,3 +721,25 @@ func validatePath(ctx PathContext, paths ...string) string {
 	}
 	return validateSafePath(ctx, paths...)
 }
+
+type testPath struct {
+	basePath
+}
+
+func (p testPath) String() string {
+	return p.path
+}
+
+func PathForTesting(paths ...string) Path {
+	p := validateSafePath(nil, paths...)
+	return testPath{basePath{path: p, rel: p}}
+}
+
+func PathsForTesting(strs []string) Paths {
+	p := make(Paths, len(strs))
+	for i, s := range strs {
+		p[i] = PathForTesting(s)
+	}
+
+	return p
+}