Make reduced classpath fallback locale-independent

Fixes #1342

--
PiperOrigin-RevId: 145144856
MOS_MIGRATED_REVID=145144856

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/ReducedClasspathJavaLibraryBuilder.java

@@ -18,7 +18,6 @@
 import com.google.devtools.build.buildjar.javac.FormattedDiagnostic;
 import com.google.devtools.build.buildjar.javac.JavacRunner;
 import java.io.IOException;
-import java.util.regex.Pattern;
 
 /**
  * A variant of SimpleJavaLibraryBuilder that attempts to reduce the compile-time classpath right
@@ -78,7 +77,16 @@ private static boolean shouldFallBack(BlazeJavacResult result) {
       return false;
     }
     for (FormattedDiagnostic diagnostic : result.diagnostics()) {
-      if (hasRecognizedError(diagnostic.getFormatted())) {
+      System.err.println(diagnostic.getCode());
+      String code = diagnostic.getCode();
+      if (code.contains("doesnt.exist")
+          || code.contains("cant.resolve")
+          || code.contains("cant.access")) {
+        return true;
+      }
+      // handle -Xdoclint:reference errors, which don't have a diagnostic code
+      // TODO(cushon): this is locale-dependent
+      if (diagnostic.getFormatted().contains("error: reference not found")) {
         return true;
       }
     }
@@ -87,16 +95,4 @@ private static boolean shouldFallBack(BlazeJavacResult result) {
     }
     return false;
   }
-
-  private static final Pattern MISSING_PACKAGE =
-      Pattern.compile("error: package ([\\p{javaJavaIdentifierPart}\\.]+) does not exist");
-
-  private static boolean hasRecognizedError(String output) {
-    // TODO(cushon): usage diagnostic codes instead
-    return output.contains("error: cannot access")
-        || output.contains("error: cannot find symbol")
-        || MISSING_PACKAGE.matcher(output).find()
-        // TODO(cushon): -Xdoclint:reference is probably a bad idea
-        || output.contains("error: reference not found");
-  }
 }