diff options
| author | Tobias Thierer <tobiast@google.com> | 2020-01-10 15:05:27 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2020-01-10 15:48:51 +0000 |
| commit | a4f3593133266b4bf1195ffbcc563241b65b6adf (patch) | |
| tree | 5dee6b504f937c4df95f13b3047e82d63b8700ab | |
| parent | 5b440706eb3d2eafe0c8a90d66b9b434bbc3b2ac (diff) | |
Set java/util/concurrent/Flow.java's reference upstream to be OpenJDK 9+181.
When that file is introduced into libcore, it will be derived from
OpenJDK 9+181. This CL updates StandardRepositories.referenceUpstream()
accordingly, which is safe to do ahead of the file existing.
Bug: 129875045
Test: Treehugger
Change-Id: I31c46e18c83d563fd2e015465c02e4a209702b88
| -rw-r--r-- | tools/upstream/src/main/java/libcore/StandardRepositories.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/upstream/src/main/java/libcore/StandardRepositories.java b/tools/upstream/src/main/java/libcore/StandardRepositories.java index b85533c78c..ad0335b550 100644 --- a/tools/upstream/src/main/java/libcore/StandardRepositories.java +++ b/tools/upstream/src/main/java/libcore/StandardRepositories.java @@ -113,7 +113,9 @@ public class StandardRepositories { public Repository referenceUpstream(Path relPath) { boolean isJsr166 = isJsr166(relPath); - if (isJsr166) { + if (relPath.toString().equals("java/util/concurrent/Flow.java")) { + return openJdk9p181; + } else if (isJsr166) { return openJdk9b113; } else if (relPath.startsWith("java/sql/") || relPath.startsWith("javax/sql/")) { return openJdk7u40; |