From 2195f253c8fed1e398718e63b6e7b4d768dc4e1f Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Mon, 24 Apr 2017 21:02:50 +0200
Subject: Update to javac9-r4023

PiperOrigin-RevId: 154078281
---
 .../com/google/devtools/build/buildjar/resourcejar/BUILD          | 2 +-
 .../buildjar/javatests/com/google/devtools/build/java/bazel/BUILD | 4 ++--
 .../javatests/com/google/devtools/build/java/turbine/javac/BUILD  | 8 ++++----
 .../devtools/build/java/turbine/javac/JavacTurbineTest.java       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/java_tools/buildjar/javatests/com')

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
index 743a4933bd..f715928990 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
@@ -12,6 +12,6 @@ java_test(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party/java/jdk/langtools:javac",
+        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
     ],
 )
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
index 4839134bee..a379582be8 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
@@ -9,11 +9,11 @@ java_test(
     size = "small",
     srcs = ["BazelJavaCompilerTest.java"],
     data = [
-        "//third_party/java/jdk/langtools:javac_jar",
+        "//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
     ],
     jvm_flags = [
         # Simulates how Bazel invokes JavaBuilder
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
+        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
     ],
     tags = ["jdk8"],
     test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
index 6ee685c078..145f0707dd 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
@@ -8,11 +8,11 @@ java_test(
     name = "JavacTurbineTest",
     srcs = ["JavacTurbineTest.java"],
     data = [
-        "//third_party/java/jdk/langtools:javac_jar",
+        "//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
     ],
     jvm_flags = [
         # Simulates how Bazel invokes turbine
-        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
+        "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
     ],
     tags = ["jdk8"],
     deps = [
@@ -25,7 +25,7 @@ java_test(
         "//third_party:junit4",
         "//third_party:truth",
         "//third_party:turbine",
-        "//third_party/java/jdk/langtools:javac",
+        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
     ],
 )
 
@@ -38,6 +38,6 @@ java_test(
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
-        "//third_party/java/jdk/langtools:javac",
+        "//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
     ],
 )
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index 8237dc1298..3b243b4ed5 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
@@ -1322,8 +1322,8 @@ public class JavacTurbineTest {
           + " implements java.util.function.Predicate<java.lang.String>",
       "abstract enum P extends java/lang/Enum  implements java/util/function/Predicate  {",
       "",
-      "  // access flags 0x4000",
-      "  enum INNERCLASS P$1 null null",
+      "  // access flags 0x4010",
+      "  final enum INNERCLASS P$1 null null",
       "",
       "  // access flags 0x4019",
       "  public final static enum LP; INSTANCE",
-- 
cgit v1.2.3