mac: Use non-xcode objdump for verify_dynamic_libraries in some scenarios

No behavior change.

Bug: 1147069
Change-Id: I8c0e3128e8799f068277860aed6475586c1f24e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2585840
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836265}

DEPS

@@ -4351,6 +4351,14 @@ hooks = [
     'action': ['python', 'src/tools/clang/scripts/update.py',
                '--package=lld_mac'],
   },
+  {
+    # Should run after the clang hook.
+    'name': 'objdump/mac',
+    'pattern': '.',
+    'condition': 'checkout_mac and host_os != "mac"',
+    'action': ['python', 'src/tools/clang/scripts/update.py',
+               '--package=objdump'],
+  },
   {
     # Update LASTCHANGE.
     'name': 'lastchange',

chrome/BUILD.gn

@@ -385,6 +385,11 @@ if (is_win) {
   chrome_framework_version = chrome_version_full
 
   verify_dynamic_libraries = !is_component_build && !is_asan
+  if (host_os == "mac") {
+    objdump_path = mac_bin_path
+  } else {
+    objdump_path = rebase_path("$clang_base_path/bin/", root_build_dir)
+  }
 
   group("chrome") {
     deps = [ ":chrome_app" ]
@@ -481,7 +486,7 @@ if (is_win) {
         "--stamp",
         rebase_path(outputs[0], root_out_dir),
         "-B",
-        mac_bin_path,
+        objdump_path,
         "--image",
         rebase_path(inputs[0], root_out_dir),
         "--allow",
@@ -700,7 +705,7 @@ if (is_win) {
           "--stamp",
           rebase_path(outputs[0], root_out_dir),
           "-B",
-          mac_bin_path,
+          objdump_path,
           "--image",
           rebase_path(inputs[0], root_out_dir),
 

chrome/tools/build/mac/verify_dynamic_libraries.py

@@ -28,7 +28,7 @@ def verify_image_libraries(image_path, allowed_libraries, binary_path):
     printed.
     """
     output = subprocess.check_output(
-        [binary_path + 'llvm-objdump', '-macho', '-dylibs-used', image_path])
+        [binary_path + 'llvm-objdump', '--macho', '--dylibs-used', image_path])
     output = unicode(output, encoding='utf8').strip()
 
     disallowed_libraries = []