[go: nahoru, domu]

Reland "Android: Add third_party/auto for errorprone""

Original CL: https://crrev.com/c/739725

Fix:
- errorprone_plugin_java depends on errorprone_java, which is only
  available on $default_toolchain.

BUG=777572
TBR=fgorski@chromium.org,brettw@chromium.org,yfriedman@chromium.org,jbudorick@chromium.org,peter@chromium.org,torne@chromium.org,agrieve@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I2dceece332036a98014943cff4ec82b152075622
Reviewed-on: https://chromium-review.googlesource.com/750645
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513513}
diff --git a/BUILD.gn b/BUILD.gn
index 23d7904..66f617bc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -304,13 +304,14 @@
       "//testing/android/junit:junit_unit_tests",
       "//third_party/android_async_task:android_async_task_java",
       "//third_party/catapult/devil",
-      "//third_party/errorprone:chromium_errorprone",
+      "//third_party/errorprone:errorprone_java",
       "//third_party/smhasher:murmurhash3",
       "//tools/android:android_tools",
       "//tools/android:memconsumer",
       "//tools/android:push_apps_to_background",
       "//tools/android/audio_focus_grabber:audio_focus_grabber_apk",
       "//tools/android/customtabs_benchmark:customtabs_benchmark_apk",
+      "//tools/android/errorprone_plugin:errorprone_plugin_java",
       "//tools/android/kerberos/SpnegoAuthenticator:spnego_authenticator_apk",
       "//tools/cygprofile:cygprofile_unittests",
       "//ui/android:ui_junit_tests",