commit b6ad455a1a597b6da0f701b001d35fcdf89c1eaa
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 21 12:22:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 21 12:22:37 2018 +0000
tree 5a8e26b0ed2b7aaf9b9571b5bcc0180d274caab8
parent 1df1a9e57ec7fd53b9f270c2c05712d3efa97596
parent 0000535fc1fc84fa3339ae4dfe3ab80558037355

Merge "Upstream verification spreadsheet: Explicitly specify repositories to compare."

tools/upstream/src/main/java/libcore/CompareUpstreams.java

diff --git a/tools/upstream/src/main/java/libcore/CompareUpstreams.java b/tools/upstream/src/main/java/libcore/CompareUpstreams.java
index 348ec62..65b0074 100644
--- a/tools/upstream/src/main/java/libcore/CompareUpstreams.java
+++ b/tools/upstream/src/main/java/libcore/CompareUpstreams.java
@@ -192,7 +192,8 @@
             if (!comparisons.get(0).equals("identical")) {
                 Path expectedUpstreamPath = expectedUpstream.pathFromRepository(relPath);
                 if (expectedUpstreamPath != null) {
-                    diffCommand = "${ANDROID_BUILD_TOP}/libcore/tools/upstream/upstream-diff " + relPath;
+                    diffCommand = "${ANDROID_BUILD_TOP}/libcore/tools/upstream/upstream-diff "
+                            + "-r ojluni," + expectedUpstream.name() + " " + relPath;
                 } else {
                     diffCommand = "FILE MISSING";
                 }