2 files changed, 41 insertions, 30 deletions

diff --git a/chromium/tools/android/errorprone_plugin/BUILD.gn b/chromium/tools/android/errorprone_plugin/BUILD.gn
index 24d5058de83..6f5759ff608 100644
--- a/chromium/tools/android/errorprone_plugin/BUILD.gn
+++ b/chromium/tools/android/errorprone_plugin/BUILD.gn
@@ -4,7 +4,11 @@
 
 import("//build/config/android/rules.gni")
 
-java_library("errorprone_plugin_java") {
+java_binary("errorprone_plugin") {
+  # main_class and wrapper script are not actually used.
+  # This target is referenced directly from java_library_impl().
+  main_class = "<ignore>"
+  wrapper_script_name = "bin/helper/errorprone_plugin"
   sources = [
     # Turned off because of existing code which fails the check
     # "src/org/chromium/tools/errorprone/plugin/NoContextGetApplicationContext.java",
@@ -19,10 +23,7 @@ java_library("errorprone_plugin_java") {
 
   # Necessary to avoid dependency cycle
   enable_errorprone = false
-  enable_bytecode_rewriter = false
-
-  # So that we don't need to inject jacoco runtime into the compiler's classpath.
-  jacoco_never_instrument = true
+  enable_bytecode_checks = false
 
   annotation_processor_deps =
       [ "//third_party/android_deps:auto_service_processor" ]
diff --git a/chromium/tools/android/md5sum/BUILD.gn b/chromium/tools/android/md5sum/BUILD.gn
index a02a7fbbf91..54f81693e0e 100644
--- a/chromium/tools/android/md5sum/BUILD.gn
+++ b/chromium/tools/android/md5sum/BUILD.gn
@@ -1,39 +1,49 @@
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+if (current_cpu == "arm" || current_cpu == "arm64") {
+  import("//build/config/arm.gni")
+}
 
-import("//build/config/android/config.gni")
-import("//build/symlink.gni")
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/symlink.gni")
 
-group("md5sum") {
-  data_deps = [
-    ":md5sum_bin_host($default_toolchain)",
-    ":md5sum_prepare_dist($default_toolchain)",
-  ]
+  group("md5sum") {
+    data_deps = [
+      ":md5sum_bin_host($default_toolchain)",
+      ":md5sum_prepare_dist($default_toolchain)",
+    ]
+
+    # TODO(cjhopman): Remove once group data_deps are fixed.
+    deps = data_deps
+  }
 
-  # TODO(cjhopman): Remove once group data_deps are fixed.
-  deps = data_deps
+  if (current_toolchain == default_toolchain) {
+    import("//build/config/android/rules.gni")
+
+    create_native_executable_dist("md5sum_prepare_dist") {
+      dist_dir = "$root_build_dir/md5sum_dist"
+      binary = "$root_build_dir/md5sum_bin"
+      deps = [ ":md5sum_bin" ]
+    }
+
+    binary_symlink("md5sum_bin_host") {
+      binary_label = ":md5sum_bin($host_toolchain)"
+      output_name = "md5sum_bin_host"
+    }
+  }
+} else {
+  # We don't need all that stuff for other OSes.
+  group("md5sum") {
+    data_deps = []
+  }
 }
 
 executable("md5sum_bin") {
   sources = [ "md5sum.cc" ]
   deps = [
     "//base",
-    "//third_party/zlib/google:compression_utils",
+    "//third_party/zlib/google:compression_utils_portable",
   ]
 }
-
-if (current_toolchain == default_toolchain) {
-  import("//build/config/android/rules.gni")
-
-  create_native_executable_dist("md5sum_prepare_dist") {
-    dist_dir = "$root_build_dir/md5sum_dist"
-    binary = "$root_build_dir/md5sum_bin"
-    deps = [ ":md5sum_bin" ]
-  }
-
-  binary_symlink("md5sum_bin_host") {
-    binary_label = ":md5sum_bin($host_toolchain)"
-    output_name = "md5sum_bin_host"
-  }
-}