Use the Errorprone Compiler

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index b1b23b0220ff355a6183c05589c795d1805cc1e9..0186929c42bd8b2ac658f5b73304524e44321d87 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -725,6 +725,9 @@ template("java_strings_grd_prebuilt") {
 #     android_library target, for example.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
+#   disable_errorprone: If true, disables the errorprone compiler. Typically
+#     only used on targets that crash with errorprone or when building the
+#     errorprone compiler itself.
 #
 #   datadeps, testonly
 #
@@ -752,6 +755,9 @@ template("java_binary") {
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
+    if (defined(invoker.disable_errorprone)) {
+      disable_errorprone = invoker.disable_errorprone
+    }
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     }
@@ -846,6 +852,10 @@ template("junit_binary") {
 #     ease the gyp->gn conversion and will be removed in the future.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
+#   disable_errorprone: If true, disables the errorprone compiler. Typically
+#     only used on targets that crash with errorprone or when building the
+#     errorprone compiler itself.
+#
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
@@ -894,6 +904,9 @@ template("java_library") {
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
+    if (defined(invoker.disable_errorprone)) {
+      disable_errorprone = invoker.disable_errorprone
+    }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
@@ -985,6 +998,10 @@ template("java_prebuilt") {
 #     ease the gyp->gn conversion and will be removed in the future.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
+#   disable_errorprone: If true, disables the errorprone compiler. Typically
+#     only used on targets that crash with errorprone or when building the
+#     errorprone compiler itself.
+#
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
 #
@@ -1030,6 +1047,9 @@ template("android_library") {
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
+    if (defined(invoker.disable_errorprone)) {
+      disable_errorprone = invoker.disable_errorprone
+    }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
@@ -1555,8 +1575,8 @@ template("unittest_apk") {
   android_apk(target_name) {
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
     java_files = [
-      "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java",
-      "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
+      "//testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestActivity.java",
+      "//testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java",
     ]
     android_manifest = "//testing/android/native_test/java/AndroidManifest.xml"
     native_libs = [ unittests_binary ]