Revert of android: Move most hooks to target_os-specific section.

DEPS

 # This file is used to manage the dependencies of the Chromium src repo. It is
 # used by gclient to determine what version of each dependency to check out, and
 # where.
 #
 # For more information, please refer to the official documentation:
 #   https://sites.google.com/a/chromium.org/dev/developers/how-tos/get-the-code
 #
 # When adding a new dependency, please update the top-level .gitignore file
 # to list the dependency's destination directory.
 #
@@ skipping 569 matching lines @@
     'name': 'nacltools',
     'pattern': '.',
     'action': [
         'python',
         'src/build/download_nacl_toolchains.py',
         '--mode', 'nacl_core_sdk',
         'sync', '--extract',
     ],
   },
   {
+    # This downloads SDK extras and puts them in the
+    # third_party/android_tools/sdk/extras directory.
+    'name': 'sdkextras',
+    'pattern': '.',
+    # When adding a new sdk extras package to download, add the package
+    # directory and zip file to .gitignore in third_party/android_tools.
+    'action': ['python',
+               'src/build/android/play_services/update.py',
+               'download'
+    ],
+  },
+  {
+    'name': 'intellij',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-intellij',
+               '-l', 'third_party/intellij'
+    ],
+  },
+  {
+    'name': 'javax_inject',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-javax-inject',
+               '-l', 'third_party/javax_inject'
+    ],
+  },
+  {
+    'name': 'hamcrest',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-hamcrest',
+               '-l', 'third_party/hamcrest'
+    ],
+  },
+  {
+    'name': 'guava',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-guava',
+               '-l', 'third_party/guava'
+    ],
+  },
+  {
+    'name': 'android_support_test_runner',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-support-test-runner',
+               '-l', 'third_party/android_support_test_runner'
+    ],
+  },
+  {
+    'name': 'byte_buddy',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-byte-buddy',
+               '-l', 'third_party/byte_buddy'
+    ],
+  },
+  {
+    'name': 'espresso',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-espresso',
+               '-l', 'third_party/espresso'
+    ],
+  },
+  {
+    'name': 'robolectric_libs',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-robolectric',
+               '-l', 'third_party/robolectric'
+    ],
+  },
+  {
+    'name': 'apache_velocity',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-apache-velocity',
+               '-l', 'third_party/apache_velocity'
+    ],
+  },
+  {
+    'name': 'ow2_asm',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-ow2-asm',
+               '-l', 'third_party/ow2_asm'
+    ],
+  },
+  {
+    'name': 'retrolambda',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-tools/retrolambda',
+               '-l', 'third_party/retrolambda'
+    ],
+  },
+  {
+    'name': 'apk-patch-size-estimator',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-android-tools/apk-patch-size-estimator',
+               '-l', 'third_party/apk-patch-size-estimator/lib'
+    ],
+  },
+  {
+    'name': 'icu4j',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-icu4j',
+               '-l', 'third_party/icu4j'
+    ],
+  },
+  {
+    'name': 'accessibility_test_framework',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-accessibility-test-framework',
+               '-l', 'third_party/accessibility_test_framework'
+    ],
+  },
+  {
+    'name': 'bouncycastle',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-bouncycastle',
+               '-l', 'third_party/bouncycastle'
+    ],
+  },
+  {
+    'name': 'sqlite4java',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-sqlite4java',
+               '-l', 'third_party/sqlite4java'
+    ],
+  },
+  {
+    'name': 'objenesis',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-objenesis',
+               '-l', 'third_party/objenesis'
+    ],
+  },
+  {
+    'name': 'xstream',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/update_deps/update_third_party_deps.py',
+               'download',
+               '-b', 'chromium-robolectric',
+               '-l', 'third_party/xstream'
+    ],
+  },
+  {
     # Downloads the current stable linux sysroot to build/linux/ if needed.
     # This sysroot updates at about the same rate that the chrome build deps
     # change. This script is a no-op except for linux users who are doing
     # official chrome builds or cross compiling.
     'name': 'sysroot',
     'pattern': '.',
     'action': ['python', 'src/build/linux/sysroot_scripts/install-sysroot.py',
                '--running-as-hook'],
   },
   {
@@ skipping 103 matching lines @@
     'name': 'clang_format_linux',
     'pattern': '.',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=linux*',
                 '--no_auth',
                 '--bucket', 'chromium-clang-format',
                 '-s', 'src/buildtools/linux64/clang-format.sha1',
     ],
   },
+  {
+    'name': 'checkstyle',
+    'pattern': '.',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--no_auth',
+                '--bucket', 'chromium-android-tools/checkstyle',
+                '-s', 'src/third_party/checkstyle/checkstyle-7.6.1-all.jar.sha1'
+    ],
+  },
+  {
+    'name': 'gvr_static_shim_android_arm',
+    'pattern': '\\.sha1',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-gvr-static-shim',
+                '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1',
+    ],
+  },
+  {
+    'name': 'gvr_static_shim_android_arm64',
+    'pattern': '\\.sha1',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-gvr-static-shim',
+                '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
+    ],
+  },
+  {
+    'name': 'gvr_common_aar',
+    'pattern': '\\.sha1',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-gvr-static-shim',
+                '-s', 'src/third_party/gvr-android-sdk/common_library.aar.sha1',
+    ],
+  },
+  {
+    'name': 'vr_controller_test_api',
+    'pattern': '\\.sha1',
+    'action': [ 'download_from_google_storage',
+                '--no_resume',
+                '--platform=linux*',
+                '--no_auth',
+                '--bucket', 'chromium-gvr-static-shim/controller_test_api',
+                '-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1',
+    ],
+  },
   # Pull luci-go binaries (isolate, swarming) using checked-in hashes.
   {
     'name': 'luci-go_win',
     'pattern': '.',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--platform=win32',
                 '--no_auth',
                 '--bucket', 'chromium-luci',
                 '-d', 'src/tools/luci-go/win64',
@@ skipping 71 matching lines @@
     ],
   },
   {
     # Pull sanitizer-instrumented third-party libraries if requested via
     # GYP_DEFINES.
     'name': 'instrumented_libraries',
     'pattern': '\\.sha1',
     'action': ['python', 'src/third_party/instrumented_libraries/scripts/download_binaries.py'],
   },
   {
+    # Pull doclava binaries if building for Android.
+    'name': 'doclava',
+    'pattern': '.',
+    'action': ['python',
+               'src/build/android/download_doclava.py',
+    ],
+  },
+  {
     "name": "wasm_fuzzer",
     "pattern": ".",
     "action": [ "download_from_google_storage",
                 "--no_resume",
                 "--no_auth",
                 "-u",
                 "--bucket", "v8-wasm-fuzzer",
                 "-s", "src/v8/test/fuzzer/wasm_corpus.tar.gz.sha1",
     ],
   },
@@ skipping 59 matching lines @@
     'name': 'webui_node_modules',
     'pattern': '.',
     'action': [ 'download_from_google_storage',
                 '--no_resume',
                 '--extract',
                 '--no_auth',
                 '--bucket', 'chromium-nodejs',
                 '-s', 'src/third_party/node/node_modules.tar.gz.sha1',
     ],
   },
+  # Download VR test APKs only if the environment variable is set
+  {
+    'name': 'vr_test_apks',
+    'pattern': '.',
+    'action': [ 'python',
+               'src/third_party/gvr-android-sdk/test-apks/update.py',
+    ],
+  },
 
   # Download Telemetry's binary dependencies
   {
     'name': 'fetch_telemetry_binary_dependencies',
     'pattern': '.',
     'action': [ 'python',
                 'src/third_party/catapult/telemetry/bin/fetch_telemetry_binary_dependencies',
     ],
   },
 ]
 
-# Note: These are keyed off target os, not host os. So don't move things here
-# that depend on the target os.
 hooks_os = {
-  'android': [
-    {
-      # This downloads SDK extras and puts them in the
-      # third_party/android_tools/sdk/extras directory.
-      'name': 'sdkextras',
-      'pattern': '.',
-      # When adding a new sdk extras package to download, add the package
-      # directory and zip file to .gitignore in third_party/android_tools.
-      'action': ['python',
-                 'src/build/android/play_services/update.py',
-                 'download'
-      ],
-    },
-    {
-      'name': 'intellij',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-intellij',
-                 '-l', 'third_party/intellij'
-      ],
-    },
-    {
-      'name': 'javax_inject',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-javax-inject',
-                 '-l', 'third_party/javax_inject'
-      ],
-    },
-    {
-      'name': 'hamcrest',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-hamcrest',
-                 '-l', 'third_party/hamcrest'
-      ],
-    },
-    {
-      'name': 'guava',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-guava',
-                 '-l', 'third_party/guava'
-      ],
-    },
-    {
-      'name': 'android_support_test_runner',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-support-test-runner',
-                 '-l', 'third_party/android_support_test_runner'
-      ],
-    },
-    {
-      'name': 'byte_buddy',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-byte-buddy',
-                 '-l', 'third_party/byte_buddy'
-      ],
-    },
-    {
-      'name': 'espresso',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-espresso',
-                 '-l', 'third_party/espresso'
-      ],
-    },
-    {
-      'name': 'robolectric_libs',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-robolectric',
-                 '-l', 'third_party/robolectric'
-      ],
-    },
-    {
-      'name': 'apache_velocity',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-apache-velocity',
-                 '-l', 'third_party/apache_velocity'
-      ],
-    },
-    {
-      'name': 'ow2_asm',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-ow2-asm',
-                 '-l', 'third_party/ow2_asm'
-      ],
-    },
-    {
-      'name': 'retrolambda',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-tools/retrolambda',
-                 '-l', 'third_party/retrolambda'
-      ],
-    },
-    {
-      'name': 'apk-patch-size-estimator',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-android-tools/apk-patch-size-estimator',
-                 '-l', 'third_party/apk-patch-size-estimator/lib'
-      ],
-    },
-    {
-      'name': 'icu4j',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-icu4j',
-                 '-l', 'third_party/icu4j'
-      ],
-    },
-    {
-      'name': 'accessibility_test_framework',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-accessibility-test-framework',
-                 '-l', 'third_party/accessibility_test_framework'
-      ],
-    },
-    {
-      'name': 'bouncycastle',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-bouncycastle',
-                 '-l', 'third_party/bouncycastle'
-      ],
-    },
-    {
-      'name': 'sqlite4java',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-sqlite4java',
-                 '-l', 'third_party/sqlite4java'
-      ],
-    },
-    {
-      'name': 'objenesis',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-objenesis',
-                 '-l', 'third_party/objenesis'
-      ],
-    },
-    {
-      'name': 'xstream',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/update_deps/update_third_party_deps.py',
-                 'download',
-                 '-b', 'chromium-robolectric',
-                 '-l', 'third_party/xstream'
-      ],
-    },
-    {
-      'name': 'checkstyle',
-      'pattern': '.',
-      'action': [ 'download_from_google_storage',
-                  '--no_resume',
-                  '--no_auth',
-                  '--bucket', 'chromium-android-tools/checkstyle',
-                  '-s', 'src/third_party/checkstyle/checkstyle-7.6.1-all.jar.sha1'
-      ],
-    },
-    {
-      'name': 'gvr_static_shim_android_arm',
-      'pattern': '\\.sha1',
-      'action': [ 'download_from_google_storage',
-                  '--no_resume',
-                  '--platform=linux*',
-                  '--no_auth',
-                  '--bucket', 'chromium-gvr-static-shim',
-                  '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm.a.sha1',
-      ],
-    },
-    {
-      'name': 'gvr_static_shim_android_arm64',
-      'pattern': '\\.sha1',
-      'action': [ 'download_from_google_storage',
-                  '--no_resume',
-                  '--platform=linux*',
-                  '--no_auth',
-                  '--bucket', 'chromium-gvr-static-shim',
-                  '-s', 'src/third_party/gvr-android-sdk/libgvr_shim_static_arm64.a.sha1',
-      ],
-    },
-    {
-      'name': 'gvr_common_aar',
-      'pattern': '\\.sha1',
-      'action': [ 'download_from_google_storage',
-                  '--no_resume',
-                  '--platform=linux*',
-                  '--no_auth',
-                  '--bucket', 'chromium-gvr-static-shim',
-                  '-s', 'src/third_party/gvr-android-sdk/common_library.aar.sha1',
-      ],
-    },
-    {
-      'name': 'vr_controller_test_api',
-      'pattern': '\\.sha1',
-      'action': [ 'download_from_google_storage',
-                  '--no_resume',
-                  '--platform=linux*',
-                  '--no_auth',
-                  '--bucket', 'chromium-gvr-static-shim/controller_test_api',
-                  '-s', 'src/third_party/gvr-android-sdk/test-libraries/controller_test_api.aar.sha1',
-      ],
-    },
-    # Download VR test APKs only if the environment variable is set
-    {
-      'name': 'vr_test_apks',
-      'pattern': '.',
-      'action': [ 'python',
-                 'src/third_party/gvr-android-sdk/test-apks/update.py',
-      ],
-    },
-    {
-      # Pull doclava binaries if building for Android.
-      'name': 'doclava',
-      'pattern': '.',
-      'action': ['python',
-                 'src/build/android/download_doclava.py',
-      ],
-    },
-  ],
   'fuchsia': [
     {
       'name': 'fuchsia_sdk',
       'pattern': '.',
       'action': [
         'python',
         'src/build/fuchsia/update_sdk.py',
         '3886a632c4a472fa7ef9eab35b45b63359e387fa',
       ],
     },
   ],
+  # TODO(scottmg|thakis): Move the Android-only hooks from above here.
 }
 
 recursedeps = [
   # buildtools provides clang_format, libc++, and libc++abi
   'src/buildtools',
   # android_tools manages the NDK.
   'src/third_party/android_tools',
   # ANGLE manages DEPS that it also owns the build files for, such as dEQP.
   ("src/third_party/angle", "DEPS.chromium"),
   # SwiftShader manages DEPS that it also owns the build files for, such as Subzero.
   ("src/third_party/swiftshader", "DEPS"),
 ]