Revert "Switch Android binary deps to be managed by CIPD. (RELAND)"

This reverts commit 4bad8727da74eb8f3e8de623d8af9a680ce4df2e.

Reason for revert: broke multiple waterfall builders

Original change's description:
> Switch Android binary deps to be managed by CIPD. (RELAND)
> 
> This is a reland of
> https://chromium-review.googlesource.com/c/chromium/src/+/544524
> 
> Bug: 
> Change-Id: I9ed736ff6a0c9c611ac064368d4ef08920fafdc2
> Reviewed-on: https://chromium-review.googlesource.com/704079
> Commit-Queue: John Budorick <jbudorick@chromium.org>
> Reviewed-by: Grace Kloba <klobag@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#512275}

TBR=klobag@chromium.org,dpranke@chromium.org,agrieve@chromium.org,jbudorick@chromium.org

Change-Id: I0cff677b78dfaf9cd8ceee659af8b71981e8291c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/742386
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#512296}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2d487c985465d2cb76c999bee17afa90ca9909df

android/gyp/jar.py

@@ -7,7 +7,6 @@
 import optparse
 import os
 import shutil
-import stat
 import sys
 import tempfile
 
@@ -43,12 +42,7 @@ def Jar(class_files, classes_dir, jar_path, manifest_file=None,
       jar_dir = os.path.dirname(full_jar_filepath)
       if not os.path.exists(jar_dir):
         os.makedirs(jar_dir)
-      # Some of our JARs are mode 0440 because they exist in the source tree as
-      # symlinks to JARs managed by CIPD. shutil.copyfile copies the contents,
-      # not the permissions, so the resulting copy is writeable despite the
-      # the source JAR not being so. (shutil.copy does copy the permissions and
-      # as such doesn't work without changing the mode after.)
-      shutil.copyfile(filepath, full_jar_filepath)
+      shutil.copy(filepath, full_jar_filepath)
       jar_cmd.append(jar_filepath)
 
     if provider_configurations:

cipd/android/android.ensure

@@ -1,63 +0,0 @@
-# Copyright 2017 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.
-
-# Dependencies for Android target OS.
-
-@Subdir third_party/accessibility_test_framework
-chromium/third_party/accessibility-test-framework version:2.1
-
-@Subdir third_party/android_support_test_runner
-chromium/third_party/android_support_test_runner version:0.5
-
-@Subdir third_party/android_system_sdk
-chromium/third_party/android_system_sdk version:0
-
-@Subdir third_party/apk-patch-size-estimator
-chromium/third_party/apk-patch-size-estimator version:0.2
-
-@Subdir third_party/bazel
-chromium/third_party/bazel version:0
-
-@Subdir third_party/bouncycastle
-chromium/third_party/bouncycastle version:1.46
-
-@Subdir third_party/byte_buddy
-chromium/third_party/byte_buddy version:1.4.17
-
-@Subdir third_party/espresso
-chromium/third_party/espresso version:2.2.1
-
-@Subdir third_party/gson
-chromium/third_party/gson version:2.8.0
-
-@Subdir third_party/guava
-chromium/third_party/guava version:20.0
-
-@Subdir third_party/hamcrest
-chromium/third_party/hamcrest version:1.3
-
-@Subdir third_party/icu4j
-chromium/third_party/icu4j version:53.1
-
-@Subdir third_party/intellij
-chromium/third_party/intellij version:12.0
-
-@Subdir third_party/javax_inject
-chromium/third_party/javax_inject version:1
-
-@Subdir third_party/objenesis
-chromium/third_party/objenesis version:2.4
-
-@Subdir third_party/ow2_asm
-chromium/third_party/ow2_asm version:5.0.1
-
-@Subdir third_party/robolectric
-chromium/third_party/robolectric version:3.2
-
-@Subdir third_party/sqlite4java
-chromium/third_party/sqlite4java version:0.282
-
-@Subdir third_party/xstream
-chromium/third_party/xstream version:1.4.8
-

cipd/cipd_wrapper.py

@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2017 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.
-
-"""Updates dependencies managed by CIPD."""
-
-import argparse
-import os
-import subprocess
-import sys
-import tempfile
-
-_SRC_ROOT = os.path.realpath(
-    os.path.join(os.path.dirname(__file__), '..', '..'))
-
-
-def cipd_ensure(root, service_url, ensure_file):
-
-  def is_windows():
-    return sys.platform in ('cygwin', 'win32')
-
-  cipd_binary = 'cipd'
-  if is_windows():
-    cipd_binary = 'cipd.bat'
-
-  with tempfile.NamedTemporaryFile() as tmp_stdouterr:
-    retcode = subprocess.call(
-        [cipd_binary, 'ensure',
-         '-ensure-file', ensure_file,
-         '-root', root,
-         '-service-url', service_url],
-        shell=is_windows(),
-        stderr=subprocess.STDOUT,
-        stdout=tmp_stdouterr)
-    if retcode:
-      tmp_stdouterr.seek(0)
-      for line in tmp_stdouterr:
-        print line,
-    return retcode
-
-
-def main():
-  parser = argparse.ArgumentParser(
-      description='Updates CIPD-managed dependencies based on the given OS.')
-
-  parser.add_argument(
-      '--chromium-root',
-      required=True,
-      help='Root directory for dependency.')
-  parser.add_argument(
-      '--service-url',
-      help='The url of the CIPD service.',
-      default='https://chrome-infra-packages.appspot.com')
-  parser.add_argument(
-      '--ensure-file',
-      type=os.path.realpath,
-      required=True,
-      help='The path to the ensure file.')
-  args = parser.parse_args()
-  return cipd_ensure(args.chromium_root, args.service_url, args.ensure_file)
-
-
-if __name__ == '__main__':
-  sys.exit(main())