BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

15 files changed, 91 insertions, 20 deletions

diff --git a/chromium/buildtools/DEPS b/chromium/buildtools/DEPS
new file mode 100644
index 00000000000..eacdb8de789
--- /dev/null
+++ b/chromium/buildtools/DEPS
@@ -0,0 +1,17 @@
+# The files DEPS and .DEPS.git need to be manually kept in sync. Depending on
+# whether buildtools is used from a svn or git project one or the other is used.
+
+recursion = 1
+use_relative_paths = True
+
+vars = {
+  "git_url": "https://chromium.googlesource.com",
+
+  "clang_format_rev": "385fc3379dc95b67d601b4384b16b1ec0bf12361",
+}
+
+deps = {
+  "clang_format/script":
+      Var("git_url") + "/chromium/llvm-project/cfe/tools/clang-format.git@" +
+      Var("clang_format_rev"),
+}
diff --git a/chromium/buildtools/checkdeps/builddeps.py b/chromium/buildtools/checkdeps/builddeps.py
index b427f5b6f47..8ffd5ee790c 100755
--- a/chromium/buildtools/checkdeps/builddeps.py
+++ b/chromium/buildtools/checkdeps/builddeps.py
@@ -111,7 +111,8 @@ def _GitSourceDirectories(base_directory):
   base_dir_norm = NormalizePath(base_directory)
   git_source_directories = set([base_dir_norm])
 
-  git_ls_files_cmd = ['git', 'ls-files']
+  git_cmd = 'git.bat' if os.name == 'nt' else 'git'
+  git_ls_files_cmd = [git_cmd, 'ls-files']
   # FIXME: Use a context manager in Python 3.2+
   popen = subprocess.Popen(git_ls_files_cmd,
                            stdout=subprocess.PIPE,
diff --git a/chromium/buildtools/checkdeps/java_checker.py b/chromium/buildtools/checkdeps/java_checker.py
index 36e46230f4c..f5fbc1faff0 100644
--- a/chromium/buildtools/checkdeps/java_checker.py
+++ b/chromium/buildtools/checkdeps/java_checker.py
@@ -39,25 +39,28 @@ class JavaChecker(object):
     self._classmap = {}
     self._PrescanFiles()
 
+  def _IgnoreDir(self, d):
+    # Skip hidden directories.
+    if d.startswith('.'):
+      return True
+    # Skip the "out" directory, as dealing with generated files is awkward.
+    # We don't want paths like "out/Release/lib.java" in our DEPS files.
+    # TODO(husky): We need some way of determining the "real" path to
+    # a generated file -- i.e., where it would be in source control if
+    # it weren't generated.
+    if d in ('out', 'xcodebuild'):
+      return True
+    # Skip third-party directories.
+    if d in ('third_party', 'ThirdParty'):
+      return True
+    return False
+
   def _PrescanFiles(self):
     for root, dirs, files in os.walk(self._base_directory):
       # Skip unwanted subdirectories. TODO(husky): it would be better to do
       # this via the skip_child_includes flag in DEPS files. Maybe hoist this
       # prescan logic into checkdeps.py itself?
-      for d in dirs:
-        # Skip hidden directories.
-        if d.startswith('.'):
-          dirs.remove(d)
-        # Skip the "out" directory, as dealing with generated files is awkward.
-        # We don't want paths like "out/Release/lib.java" in our DEPS files.
-        # TODO(husky): We need some way of determining the "real" path to
-        # a generated file -- i.e., where it would be in source control if
-        # it weren't generated.
-        if d == 'out':
-          dirs.remove(d)
-        # Skip third-party directories.
-        if d in ('third_party', 'ThirdParty'):
-          dirs.remove(d)
+      dirs[:] = [d for d in dirs if not self._IgnoreDir(d)]
       for f in files:
         if f.endswith('.java'):
           self._PrescanFile(os.path.join(root, f))
diff --git a/chromium/buildtools/clang_format/OWNERS b/chromium/buildtools/clang_format/OWNERS
new file mode 100644
index 00000000000..8717e15ac44
--- /dev/null
+++ b/chromium/buildtools/clang_format/OWNERS
@@ -0,0 +1,2 @@
+nick@chromium.org
+thakis@chromium.org
diff --git a/chromium/buildtools/clang_format/README.chromium b/chromium/buildtools/clang_format/README.chromium
new file mode 100644
index 00000000000..0c525f708e8
--- /dev/null
+++ b/chromium/buildtools/clang_format/README.chromium
@@ -0,0 +1,15 @@
+Name: clang-format
+Short Name: clang-format
+URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/
+Version: 3.5
+Date: 30 Oct 2014
+Revision: See DEPS
+License: University of Illinois/NCSA Open Source License
+License File: NOT_SHIPPED
+Security Critical: No
+
+Description:
+A tool for formatting C++ code to style.
+
+Local Modifications:
+None
diff --git a/chromium/buildtools/clang_format/README.txt b/chromium/buildtools/clang_format/README.txt
new file mode 100644
index 00000000000..7d65a1276f2
--- /dev/null
+++ b/chromium/buildtools/clang_format/README.txt
@@ -0,0 +1,28 @@
+This folder contains clang-format scripts. The binaries will be automatically
+downloaded from Google Storage by gclient runhooks for the current platform.
+
+For a walkthrough on how to maintain these binaries:
+  https://code.google.com/p/chromium/wiki/UpdatingClangFormatBinaries
+
+To upload a file:
+  python ~/depot_tools/upload_to_google_storage.py -b chromium-clang-format <FILENAME>
+
+To download a file given a .sha1 file:
+  python ~/depot_tools/download_from_google_storage.py -b chromium-clang-format -s <FILENAME>.sha1
+
+List the contents of GN's Google Storage bucket:
+  python ~/depot_tools/third_party/gsutil/gsutil ls gs://chromium-clang-format/
+
+To initialize gsutil's credentials:
+  python ~/depot_tools/third_party/gsutil/gsutil config
+
+  That will give a URL which you should log into with your web browser. The
+  username should be the one that is on the ACL for the "chromium-clang-format"
+  bucket (probably your @google.com address). Contact the build team for help
+  getting access if necessary.
+
+  Copy the code back to the command line util. Ignore the project ID (it's OK
+  to just leave blank when prompted).
+
+gsutil documentation:
+  https://developers.google.com/storage/docs/gsutil
diff --git a/chromium/buildtools/linux32/gn.sha1 b/chromium/buildtools/linux32/gn.sha1
index d2ff7023cb9..300d5b6ddf0 100644
--- a/chromium/buildtools/linux32/gn.sha1
+++ b/chromium/buildtools/linux32/gn.sha1
@@ -1 +1 @@
-257458a058760314036e38bdb56647548474b5b3
\ No newline at end of file
+bfaa3e80ddd4b8688e4d8ddf115cd0632f1abc61
\ No newline at end of file
diff --git a/chromium/buildtools/linux64/clang-format.sha1 b/chromium/buildtools/linux64/clang-format.sha1
new file mode 100644
index 00000000000..d160fd8c750
--- /dev/null
+++ b/chromium/buildtools/linux64/clang-format.sha1
@@ -0,0 +1 @@
+76267ebd69846fb255d926fb71e2f70a538a9e22
\ No newline at end of file
diff --git a/chromium/buildtools/linux64/gn.sha1 b/chromium/buildtools/linux64/gn.sha1
index 1e0791fb382..bcd111bf986 100644
--- a/chromium/buildtools/linux64/gn.sha1
+++ b/chromium/buildtools/linux64/gn.sha1
@@ -1 +1 @@
-85ec3797a1263b8d633f88b537c6f0840ccbb62e
\ No newline at end of file
+4a369d2fb3f30b23ef3151efc353ee34f82f3bd8
\ No newline at end of file
diff --git a/chromium/buildtools/mac/clang-format.sha1 b/chromium/buildtools/mac/clang-format.sha1
new file mode 100644
index 00000000000..bf11a2ed7c7
--- /dev/null
+++ b/chromium/buildtools/mac/clang-format.sha1
@@ -0,0 +1 @@
+b4486d3c3682c063774f7eb65b9f0c2b7d476b31
\ No newline at end of file
diff --git a/chromium/buildtools/mac/gn.sha1 b/chromium/buildtools/mac/gn.sha1
index 676ac3c5573..3dfa397b676 100644
--- a/chromium/buildtools/mac/gn.sha1
+++ b/chromium/buildtools/mac/gn.sha1
@@ -1 +1 @@
-dceee45ef9bfa1b389d504106506e63df0adc9ae
+898b9794e282fc247ee585c461e61b4576942533
\ No newline at end of file
diff --git a/chromium/buildtools/toolchain_vs2013.hash b/chromium/buildtools/toolchain_vs2013.hash
new file mode 100644
index 00000000000..4afc33b3959
--- /dev/null
+++ b/chromium/buildtools/toolchain_vs2013.hash
@@ -0,0 +1,2 @@
+3fa540f7ff4aaf5e1e0d2dca1f4b99dda91bb281
+9d9a93134b3eabd003b85b4e7dea06c0eae150ed
diff --git a/chromium/buildtools/win/clang-format.exe.sha1 b/chromium/buildtools/win/clang-format.exe.sha1
new file mode 100644
index 00000000000..2bc4b531729
--- /dev/null
+++ b/chromium/buildtools/win/clang-format.exe.sha1
@@ -0,0 +1 @@
+2540ac438d185133b666adca2aec26650f2cf746
\ No newline at end of file
diff --git a/chromium/buildtools/win/gn.exe.sha1 b/chromium/buildtools/win/gn.exe.sha1
index b8009a6aa42..9d42e226664 100644
--- a/chromium/buildtools/win/gn.exe.sha1
+++ b/chromium/buildtools/win/gn.exe.sha1
@@ -1 +1 @@
-426f62ed6bd80b5c1395705fbee7e2578c521eaa
+04c4b48eeebc727ed93d33ac02f01ca926ec21db
\ No newline at end of file
diff --git a/chromium/buildtools/win/upload.bat b/chromium/buildtools/win/upload_gn.bat
index 8a3d6514981..c8c0953d81b 100755
--- a/chromium/buildtools/win/upload.bat
+++ b/chromium/buildtools/win/upload_gn.bat
@@ -1 +1 @@
-python C:\apps\depot_tools\upload_to_google_storage.py -b chromium-gn gn.exe

+python C:\apps\depot_tools\upload_to_google_storage.py -b chromium-gn gn.exe