libv8 6.0.286.44.0beta1 → 6.0.286.54.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc0a206307d9b091b3776c9b2153cb92cef4309
-  data.tar.gz: '091690ca75c293d0a94512e316b8b9dec4219f76'
+  metadata.gz: 91d67fd3a863b85bccfc38a1416c7382ea245228
+  data.tar.gz: b0089b40f9d4baa10876231a50acc1460ff6599c
 SHA512:
-  metadata.gz: 05ce392227aa95ee504ecab1908e953d980e2be090e58ecbb5241df263852bd3a02bb1933cb6fc7a40ee0eadba510a614e10b7658be40ed5d810042ceff13f35
-  data.tar.gz: 6869dd017ad635874be096a503c6172b7dc62e6de0751c9fa91c2543c41ac8d4d2bea14a99e2ec711e15ace6b5d8fabc4b526a7afca7537ffcee3a94deb5a2ed
+  metadata.gz: c27163faaf1d7f9149315d3b0c2528a8ae680f0e486649f8d2e8889e18723e3f3fd631fb854346e3dd8fa275adae162abdd29e67fbfc7ef00d41ccc47901be91
+  data.tar.gz: 1278dcaed4fb81ed8636ec69d54b554ebc1b563c4c4df1cff1e357ddd8d9b597dfaf498f7af6a39edf297f810c364740e8c5198a56a0d070ef252dd28b18fb24

data/CHANGELOG.md

@@ -1,9 +1,11 @@
-### v5.9.211.38.0beta1 - Unreleased
+### v6.0.286.54.0 - Unreleased
 
-* Update upstream v8 version to 6.0.286.44
+* Update upstream v8 version to 6.0.286.54
 * V8 source is no longer pulled using the fetch command from depot_tools but is
   instead added as a submodule in the current tree
 * Hooks are no longer ran after syncing V8's upstream dependencies
+* Reordered libraries in accordance with the V8 wiki
+* Added groups around the library flags in accordance with the V8 wiki
 
 ### v5.9.211.38.0, v5.9.211.38.1 - 2017-07-26
 

data/ext/libv8/location.rb

@@ -29,7 +29,7 @@ module Libv8
 
       def configure(context = MkmfContext.new)
         context.incflags.insert 0, Libv8::Paths.include_paths.map{ |p| "-I#{p}" }.join(" ")  + " "
-        context.ldflags.insert 0, Libv8::Paths.object_paths.join(" ") + " "
+        context.ldflags.insert 0, "-Wl,--start-group " + Libv8::Paths.object_paths.join(" ") + " -Wl,--end-group "
       end
 
       def verify_installation!

data/ext/libv8/paths.rb

@@ -11,7 +11,7 @@ module Libv8
     end
 
     def object_paths
-      [:base, :libplatform, :libsampler, :libbase, :snapshot].map do |name|
+      [:base, :libbase, :snapshot, :libplatform, :libsampler].map do |name|
         Shellwords.escape libv8_object(name)
       end
     end

data/lib/libv8/version.rb

@@ -1,3 +1,3 @@
 module Libv8
-  VERSION = "6.0.286.44.0beta1"
+  VERSION = "6.0.286.54.0beta1"
 end

data/patches/0001-Build-a-standalone-static-library.patch

@@ -1,4 +1,4 @@
-From b3d75137651a41d141c29c55725bc97485b247d8 Mon Sep 17 00:00:00 2001
+From 6c28fb0319c5e2e7afad4b5731fc0ded86e1f7e7 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:00:19 +0300
 Subject: [PATCH 1/5] Build a standalone static library

data/patches/0002-Don-t-compile-unnecessary-stuff.patch

@@ -1,18 +1,18 @@
-From 45000acd2fe5ccf48d1061f76eea2333524ebe74 Mon Sep 17 00:00:00 2001
+From 31d199f67ff88be5576869abcc23ecf219fa1e6f Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
-Date: Tue, 28 Feb 2017 00:04:26 +0200
+Date: Fri, 28 Jul 2017 11:11:08 +0300
 Subject: [PATCH 2/5] Don't compile unnecessary stuff
 
 ---
- Makefile         | 14 ++++----------
+ Makefile         | 12 +++---------
  gypfiles/all.gyp | 33 ---------------------------------
- 2 files changed, 4 insertions(+), 43 deletions(-)
+ 2 files changed, 3 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ed5b3a7fab..360dc3a1a1 100644
+index ed5b3a7fab..04eddb5e8a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -265,16 +265,10 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
+@@ -265,15 +265,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
  		 android_mipsel android_x87
  
  # List of files that trigger Makefile regeneration:
@@ -25,14 +25,12 @@ index ed5b3a7fab..360dc3a1a1 100644
 -	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
 -	   buildtools/third_party/libc++abi/libc++abi.gyp \
 -	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
--	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
 +GYPFILES = gypfiles/shim_headers.gypi gypfiles/features.gypi \
-+           gypfiles/standalone.gypi gypfiles/toolchain.gypi \
-+           gypfiles/all.gyp gypfiles/mac/asan.gyp \
-+	   tools/parser-shell.gyp src/d8.gyp
++           gypfiles/standalone.gypi gypfiles/all.gyp \
++	   gypfiles/mac/asan.gyp src/v8.gyp tools/parser-shell.gyp \
+ 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
  
  # If vtunejit=on, the v8vtune.gyp will be appended.
- ifeq ($(vtunejit), on)
 diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
 index bc9d9650eb..96820a0ecc 100644
 --- a/gypfiles/all.gyp

data/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch

@@ -1,4 +1,4 @@
-From 185c0249653dafb4ae20d21f2a0cc241c3e96c64 Mon Sep 17 00:00:00 2001
+From fe76837b00357250a01ad71c4cce4b7524dd765f Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:05:47 +0300
 Subject: [PATCH 3/5] Use the -fPIC flag for the static library

data/patches/0004-Do-not-embed-debug-symbols-in-macOS-libraries.patch

@@ -1,4 +1,4 @@
-From 596e88c9c1a158abc878bd81112aa9b5ec38033a Mon Sep 17 00:00:00 2001
+From 7b00cf7c2c13d4c528bccd3bc4a91426f4e35145 Mon Sep 17 00:00:00 2001
 From: Jb Aviat <jb@sqreen.io>
 Date: Mon, 27 Feb 2017 11:14:42 +0200
 Subject: [PATCH 4/5] Do not embed debug symbols in macOS libraries

data/patches/0005-Fix-GCC-7-build-errors.patch

@@ -1,4 +1,4 @@
-From da4cfa16ed1cbbc5e2ecfeecb64cbe939029ff36 Mon Sep 17 00:00:00 2001
+From a8f772b3a6bcfad871b4d09935727032faf84df2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <mic.besace@gmail.com>
 Date: Tue, 20 Jun 2017 13:14:38 +0200
 Subject: [PATCH 5/5] Fix GCC 7 build errors

data/spec/location_spec.rb

@@ -64,7 +64,7 @@ describe "libv8 locations" do
     end
 
     it "prepends the locations of any libv8 objects on the the ldflags" do
-      expect(@context.ldflags).to eql "/foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libplatform.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libsampler.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libbase.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a -lobjc -lpthread"
+      expect(@context.ldflags).to eql "-Wl,--start-group /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_base.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libbase.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_snapshot.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libplatform.a /foo\\ bar/v8/out/x64.release/obj.target/tools/gyp/libv8_libsampler.a -Wl,--end-group -lobjc -lpthread"
     end
   end
 end

data/vendor/depot_tools/.gitattributes

@@ -9,7 +9,7 @@
 /*.py  recipes
 /*.sh  recipes
 
-# Extensionless tools we want
+# Extensionless tools we want and support scripts.
 /apply_issue                  recipes
 /clang*                       recipes
 /depot-tools-auth             recipes

data/vendor/depot_tools/bootstrap/win/manifest.txt

@@ -15,4 +15,4 @@
 infra/python/cpython/windows-386 version:2.7.6
 
 @Subdir git
-infra/git/${platform} version:2.10.0
+infra/git/${platform} version:2.14.1.chromium10

data/vendor/depot_tools/bootstrap/win/manifest_bleeding_edge.txt

@@ -15,4 +15,4 @@
 infra/python/cpython/${platform} version:2.7.13.chromium7
 
 @Subdir git
-infra/git/${platform} version:2.10.0
+infra/git/${platform} version:2.14.1.chromium10

data/vendor/depot_tools/bootstrap/win/win_tools.bat

@@ -58,7 +58,7 @@ set WIN_TOOLS_EXTRA_ARGS=%WIN_TOOLS_EXTRA_ARGS% --win-tools-name "%WIN_TOOLS_NAM
 :: Install our CIPD packages. The CIPD client self-bootstraps.
 :: See "//cipd.bat" and "//cipd.ps1" for more information.
 set CIPD_EXE=%WIN_TOOLS_ROOT_DIR%\cipd.bat
-call "%CIPD_EXE%" ensure -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%"
+call "%CIPD_EXE%" ensure -log-level warning -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%WIN_TOOLS_PATH%"
 if errorlevel 1 goto :END
 
 :: This executes "win_tools.py" using the bundle's Python interpreter.

data/vendor/depot_tools/cipd

@@ -49,8 +49,7 @@ CLIENT="$MYPATH/.cipd_client"
 USER_AGENT="depot_tools/$(git -C $MYPATH rev-parse HEAD 2>/dev/null || echo "???")"
 
 if [ ! -e "$CLIENT" ]; then
-  echo "Bootstrapping cipd client for ${PLAT}-${ARCH}..."
-  echo "From $URL"
+  echo "Bootstrapping cipd client for ${PLAT}-${ARCH} from ${URL}..."
   if hash curl 2> /dev/null ; then
     # Download the client into a temporary file, then move it into the final
     # location atomically.
@@ -60,7 +59,7 @@ if [ ! -e "$CLIENT" ]; then
       mktemp -p "$MYPATH" 2>/dev/null || \
       mktemp "$MYPATH/.cipd_client.XXXXXXX")
 
-    curl "$URL" -f -A "$USER_AGENT"  -L -o "$CIPD_CLIENT_TMP"
+    curl "$URL" -s --show-error -f -A "$USER_AGENT"  -L -o "$CIPD_CLIENT_TMP"
     chmod +x "$CIPD_CLIENT_TMP"
 
     set +e

data/vendor/depot_tools/cipd.ps1

@@ -49,12 +49,8 @@ while ($true) {
       $cipd_lock_file = [IO.File]::OpenWrite($cipd_lock)
 
       if (!(Test-Path $client)) {
-          echo "Bootstrapping cipd client for $plat-$arch..."
-          echo "From $url"
+          echo "Bootstrapping cipd client for $plat-$arch from $url..."
 
-          # TODO(iannucci): It would be really nice if there was a way to get this to
-          # show progress without also completely destroying the download speed, but
-          # I can't seem to find a way to do it. Patches welcome :)
           $wc = (New-Object System.Net.WebClient)
           $wc.Headers.add('User-Agent', $user_agent)
           $wc.DownloadFile($url, $client)
@@ -68,4 +64,4 @@ while ($true) {
           $cipd_lock_file.close()
       }
   }
-}
+}

data/vendor/depot_tools/cipd_bin_setup.bat

@@ -3,4 +3,4 @@
 :: Use of this source code is governed by a BSD-style license that can be
 :: found in the LICENSE file.
 
-"%~dp0\cipd.bat" ensure -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin"
+"%~dp0\cipd.bat" ensure -log-level warning -ensure-file "%~dp0\cipd_manifest.txt" -root "%~dp0\.cipd_bin"

data/vendor/depot_tools/cipd_bin_setup.sh

@@ -5,6 +5,8 @@
 function cipd_bin_setup {
     local MYPATH=$(dirname "${BASH_SOURCE[0]}")
 
-    "$MYPATH/cipd" ensure -ensure-file "$MYPATH/cipd_manifest.txt" \
+    "$MYPATH/cipd" ensure \
+        -log-level warning \
+        -ensure-file "$MYPATH/cipd_manifest.txt" \
         -root "$MYPATH/.cipd_bin"
 }

data/vendor/depot_tools/cipd_client_version

@@ -1 +1 @@
-git_revision:5cf65fdf804a9b3f3023f79d5b3cab2a88ccd09e
+git_revision:cf5b0de14e94b06274d15e84b19449f580576e80

data/vendor/depot_tools/cpplint.py

@@ -3045,36 +3045,6 @@ def CheckComment(line, filename, linenum, next_line_start, error):
               'Should have a space between // and comment')
 
 
-def CheckAccess(filename, clean_lines, linenum, nesting_state, error):
-  """Checks for improper use of DISALLOW* macros.
-
-  Args:
-    filename: The name of the current file.
-    clean_lines: A CleansedLines instance containing the file.
-    linenum: The number of the line to check.
-    nesting_state: A NestingState instance which maintains information about
-                   the current stack of nested blocks being parsed.
-    error: The function to call with any errors found.
-  """
-  line = clean_lines.elided[linenum]  # get rid of comments and strings
-
-  matched = Match((r'\s*(DISALLOW_COPY_AND_ASSIGN|'
-                   r'DISALLOW_IMPLICIT_CONSTRUCTORS)'), line)
-  if not matched:
-    return
-  if nesting_state.stack and isinstance(nesting_state.stack[-1], _ClassInfo):
-    if nesting_state.stack[-1].access != 'private':
-      error(filename, linenum, 'readability/constructors', 3,
-            '%s must be in the private: section' % matched.group(1))
-
-  else:
-    # Found DISALLOW* macro outside a class declaration, or perhaps it
-    # was used inside a function when it should have been part of the
-    # class declaration.  We could issue a warning here, but it
-    # probably resulted in a compiler error already.
-    pass
-
-
 def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
   """Checks for the correctness of various spacing issues in the code.
 
@@ -4303,7 +4273,6 @@ def CheckStyle(filename, clean_lines, linenum, file_extension, nesting_state,
   CheckBraces(filename, clean_lines, linenum, error)
   CheckTrailingSemicolon(filename, clean_lines, linenum, error)
   CheckEmptyBlockBody(filename, clean_lines, linenum, error)
-  CheckAccess(filename, clean_lines, linenum, nesting_state, error)
   CheckSpacing(filename, clean_lines, linenum, nesting_state, error)
   CheckOperatorSpacing(filename, clean_lines, linenum, error)
   CheckParenthesisSpacing(filename, clean_lines, linenum, error)

data/vendor/depot_tools/gclient.py

@@ -194,7 +194,8 @@ class Hook(object):
         not gclient_eval.EvaluateCondition(self._condition, self._variables)):
       return
 
-    cmd = list(self._action)
+    cmd = [arg.format(**self._variables) for arg in self._action]
+
     if cmd[0] == 'python':
       # If the hook specified "python" as the first item, the action is a
       # Python script.  Run it by starting a new copy of the same
@@ -221,32 +222,16 @@ class Hook(object):
             gclient_utils.CommandToStr(cmd), elapsed_time))
 
 
-class GClientKeywords(object):
-  class VarImpl(object):
-    def __init__(self, custom_vars, local_scope):
-      self._custom_vars = custom_vars
-      self._local_scope = local_scope
-
-    def Lookup(self, var_name):
-      """Implements the Var syntax."""
-      if var_name in self._custom_vars:
-        return self._custom_vars[var_name]
-      elif var_name in self._local_scope.get("vars", {}):
-        return self._local_scope["vars"][var_name]
-      raise gclient_utils.Error("Var is not defined: %s" % var_name)
-
-
-class DependencySettings(GClientKeywords):
+class DependencySettings(object):
   """Immutable configuration settings."""
   def __init__(
-      self, parent, url, managed, custom_deps, custom_vars,
+      self, parent, raw_url, url, managed, custom_deps, custom_vars,
       custom_hooks, deps_file, should_process, relative,
       condition, condition_value):
-    GClientKeywords.__init__(self)
-
     # These are not mutable:
     self._parent = parent
     self._deps_file = deps_file
+    self._raw_url = raw_url
     self._url = url
     # The condition as string (or None). Useful to keep e.g. for flatten.
     self._condition = condition
@@ -324,8 +309,14 @@ class DependencySettings(GClientKeywords):
   def custom_hooks(self):
     return self._custom_hooks[:]
 
+  @property
+  def raw_url(self):
+    """URL before variable expansion."""
+    return self._raw_url
+
   @property
   def url(self):
+    """URL after variable expansion."""
     return self._url
 
   @property
@@ -354,12 +345,12 @@ class DependencySettings(GClientKeywords):
 class Dependency(gclient_utils.WorkItem, DependencySettings):
   """Object that represents a dependency checkout."""
 
-  def __init__(self, parent, name, url, managed, custom_deps,
+  def __init__(self, parent, name, raw_url, url, managed, custom_deps,
                custom_vars, custom_hooks, deps_file, should_process,
                relative, condition, condition_value):
     gclient_utils.WorkItem.__init__(self, name)
     DependencySettings.__init__(
-        self, parent, url, managed, custom_deps, custom_vars,
+        self, parent, raw_url, url, managed, custom_deps, custom_vars,
         custom_hooks, deps_file, should_process, relative,
         condition, condition_value)
 
@@ -553,7 +544,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     raise gclient_utils.Error('Unknown url type')
 
   @staticmethod
-  def MergeWithOsDeps(deps, deps_os, target_os_list):
+  def MergeWithOsDeps(deps, deps_os, target_os_list, process_all_deps):
     """Returns a new "deps" structure that is the deps sent in updated
     with information from deps_os (the deps_os section of the DEPS
     file) that matches the list of target os."""
@@ -570,7 +561,7 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
         if isinstance(value, basestring):
           value = {'url': value}
         assert isinstance(value, collections.Mapping), (key, value)
-        value['should_process'] = dep_os in target_os_list
+        value['should_process'] = dep_os in target_os_list or process_all_deps
 
         # Handle collisions/overrides.
         if key in new_deps and new_deps[key] != value:
@@ -636,21 +627,25 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       condition = None
       condition_value = True
       if isinstance(dep_value, basestring):
-        url = dep_value
+        raw_url = dep_value
       else:
         # This should be guaranteed by schema checking in gclient_eval.
         assert isinstance(dep_value, collections.Mapping)
-        url = dep_value['url']
+        raw_url = dep_value['url']
         # Take into account should_process metadata set by MergeWithOsDeps.
         should_process = (should_process and
                           dep_value.get('should_process', True))
         condition = dep_value.get('condition')
+
+      url = raw_url.format(**self.get_vars())
+
       if condition:
         condition_value = gclient_eval.EvaluateCondition(
             condition, self.get_vars())
-        should_process = should_process and condition_value
+        if not self._get_option('process_all_deps', False):
+          should_process = should_process and condition_value
       deps_to_add.append(Dependency(
-          self, name, url, None, None, self.custom_vars, None,
+          self, name, raw_url, url, None, None, self.custom_vars, None,
           deps_file, should_process, use_relative_paths, condition,
           condition_value))
     deps_to_add.sort(key=lambda x: x.name)
@@ -685,10 +680,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
 
     local_scope = {}
     if deps_content:
-      # One thing is unintuitive, vars = {} must happen before Var() use.
-      var = self.VarImpl(self.custom_vars, local_scope)
       global_scope = {
-        'Var': var.Lookup,
+        'Var': lambda var_name: '{%s}' % var_name,
         'deps_os': {},
       }
       # Eval the content.
@@ -715,9 +708,14 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     self._gn_args_file = local_scope.get('gclient_gn_args_file')
     self._gn_args = local_scope.get('gclient_gn_args', [])
 
+    self._vars = local_scope.get('vars', {})
+    if self.parent:
+      for key, value in self.parent.get_vars().iteritems():
+        if key in self._vars:
+          self._vars[key] = value
     # Since we heavily post-process things, freeze ones which should
     # reflect original state of DEPS.
-    self._vars = gclient_utils.freeze(local_scope.get('vars', {}))
+    self._vars = gclient_utils.freeze(self._vars)
 
     # If use_relative_paths is set in the DEPS file, regenerate
     # the dictionary using paths relative to the directory containing
@@ -734,7 +732,10 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
     elif self._relative:
       rel_prefix = os.path.dirname(self.name)
 
-    deps = local_scope.get('deps', {})
+    deps = {}
+    for key, value in local_scope.get('deps', {}).iteritems():
+      deps[key.format(**self.get_vars())] = value
+
     if 'recursion' in local_scope:
       self.recursion_override = local_scope.get('recursion')
       logging.warning(
@@ -770,7 +771,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
       if target_os_list and not self._get_option(
           'do_not_merge_os_specific_entries', False):
         deps = self.MergeWithOsDeps(
-            deps, local_scope['deps_os'], target_os_list)
+            deps, local_scope['deps_os'], target_os_list,
+            self._get_option('process_all_deps', False))
 
     deps_to_add = self._deps_to_objects(
         self._postprocess_deps(deps, rel_prefix), use_relative_paths)
@@ -1168,6 +1170,7 @@ class GClient(Dependency):
     "linux2": "unix",
     "linux3": "unix",
     "android": "android",
+    "ios": "ios",
   }
 
   DEFAULT_CLIENT_FILE_TEXT = ("""\
@@ -1203,7 +1206,7 @@ solutions = [
     # Do not change previous behavior. Only solution level and immediate DEPS
     # are processed.
     self._recursion_limit = 2
-    Dependency.__init__(self, None, None, None, True, None, None, None,
+    Dependency.__init__(self, None, None, None, None, True, None, None, None,
                         'unused', True, None, None, True)
     self._options = options
     if options.deps_os:
@@ -1267,7 +1270,7 @@ it or fix the checkout.
     else:
       self._enforced_os = tuple(set(self._enforced_os).union(target_os))
 
-    cache_dir = config_dict.get('cache_dir')
+    cache_dir = config_dict.get('cache_dir', self._options.cache_dir)
     if cache_dir:
       cache_dir = os.path.join(self.root_dir, cache_dir)
       cache_dir = os.path.abspath(cache_dir)
@@ -1286,7 +1289,7 @@ it or fix the checkout.
     for s in config_dict.get('solutions', []):
       try:
         deps_to_add.append(Dependency(
-            self, s['name'], s['url'],
+            self, s['name'], s['url'], s['url'],
             s.get('managed', True),
             s.get('custom_deps', {}),
             s.get('custom_vars', {}),
@@ -1719,6 +1722,31 @@ class Flattener(object):
     assert self._deps_string is not None
     return self._deps_string
 
+  def _pin_dep(self, dep):
+    """Pins a dependency to specific full revision sha.
+
+    Arguments:
+      dep (Dependency): dependency to process
+    """
+    if dep.parsed_url is None:
+      return
+
+    # Make sure the revision is always fully specified (a hash),
+    # as opposed to refs or tags which might change. Similarly,
+    # shortened shas might become ambiguous; make sure to always
+    # use full one for pinning.
+    url, revision = gclient_utils.SplitUrlRevision(dep.parsed_url)
+    if revision and gclient_utils.IsFullGitSha(revision):
+      return
+
+    scm = gclient_scm.CreateSCM(
+        dep.parsed_url, self._client.root_dir, dep.name, dep.outbuf)
+    revinfo = scm.revinfo(self._client._options, [], None)
+
+    dep._parsed_url = dep._url = '%s@%s' % (url, revinfo)
+    raw_url, _ = gclient_utils.SplitUrlRevision(dep._raw_url)
+    dep._raw_url = '%s@%s' % (raw_url, revinfo)
+
   def _flatten(self, pin_all_deps=False):
     """Runs the flattener. Saves resulting DEPS string.
 
@@ -1727,19 +1755,29 @@ class Flattener(object):
           in DEPS
     """
     for solution in self._client.dependencies:
-      self._flatten_solution(solution)
+      self._add_dep(solution)
+      self._flatten_dep(solution)
 
     if pin_all_deps:
       for dep in self._deps.itervalues():
-        if dep.parsed_url is None:
-          continue
-        url, revision = gclient_utils.SplitUrlRevision(dep.parsed_url)
-        if revision and gclient_utils.IsGitSha(revision):
-          continue
-        scm = gclient_scm.CreateSCM(
-            dep.parsed_url, self._client.root_dir, dep.name, dep.outbuf)
-        dep._parsed_url = dep._url = '%s@%s' % (
-            url, scm.revinfo(self._client._options, [], None))
+        self._pin_dep(dep)
+
+      for os_deps in self._deps_os.itervalues():
+        for dep in os_deps.itervalues():
+          self._pin_dep(dep)
+
+    deps_files = set()
+    def add_deps_file(dep):
+      deps_path = os.path.join(self._client.root_dir, dep.name, dep.deps_file)
+      if not os.path.exists(deps_path):
+        return
+      assert dep.parsed_url
+      deps_files.add((dep.parsed_url, dep.deps_file))
+    for dep in self._deps.itervalues():
+      add_deps_file(dep)
+    for os_deps in self._deps_os.itervalues():
+      for dep in os_deps.itervalues():
+        add_deps_file(dep)
 
     self._deps_string = '\n'.join(
         _GNSettingsToLines(
@@ -1752,65 +1790,95 @@ class Flattener(object):
         _HooksToLines('pre_deps_hooks', self._pre_deps_hooks) +
         _HooksOsToLines(self._hooks_os) +
         _VarsToLines(self._vars) +
+        ['# %s, %s' % (url, deps_file)
+         for url, deps_file in sorted(deps_files)] +
         [''])  # Ensure newline at end of file.
 
-  def _flatten_solution(self, solution):
-    """Visits a solution in order to flatten it (see CMDflatten).
+  def _add_dep(self, dep):
+    """Helper to add a dependency to flattened DEPS.
 
     Arguments:
-      solution (Dependency): one of top-level solutions in .gclient
+      dep (Dependency): dependency to add
     """
-    self._flatten_dep(solution)
-    self._flatten_recurse(solution)
+    assert dep.name not in self._deps or self._deps.get(dep.name) == dep, (
+        dep.name, self._deps.get(dep.name))
+    if dep.url:
+      self._deps[dep.name] = dep
+
+  def _add_os_dep(self, os_dep, dep_os):
+    """Helper to add an OS-specific dependency to flattened DEPS.
 
-  def _flatten_dep(self, dep):
+    Arguments:
+      os_dep (Dependency): dependency to add
+      dep_os (str): name of the OS
+    """
+    assert (
+        os_dep.name not in self._deps_os.get(dep_os, {}) or
+        self._deps_os.get(dep_os, {}).get(os_dep.name) == os_dep), (
+            os_dep.name, self._deps_os.get(dep_os, {}).get(os_dep.name))
+    if os_dep.url:
+      # OS-specific deps need to have their full URL resolved manually.
+      assert not os_dep.parsed_url, (os_dep, os_dep.parsed_url)
+      os_dep._parsed_url = os_dep.LateOverride(os_dep.url)
+
+      self._deps_os.setdefault(dep_os, {})[os_dep.name] = os_dep
+
+  def _flatten_dep(self, dep, dep_os=None):
     """Visits a dependency in order to flatten it (see CMDflatten).
 
     Arguments:
       dep (Dependency): dependency to process
+      dep_os (str or None): name of the OS |dep| is specific to
     """
-    self._allowed_hosts.update(dep.allowed_hosts)
+    logging.debug('_flatten_dep(%s, %s)', dep.name, dep_os)
 
-    assert dep.name not in self._deps
-    self._deps[dep.name] = dep
+    if not dep.deps_parsed:
+      dep.ParseDepsFile()
+
+    self._allowed_hosts.update(dep.allowed_hosts)
 
     for key, value in dep.get_vars().iteritems():
-      assert key not in self._vars
+      # Make sure there are no conflicting variables. It is fine however
+      # to use same variable name, as long as the value is consistent.
+      assert key not in self._vars or self._vars[key][1] == value
       self._vars[key] = (dep, value)
 
-    self._hooks.extend([(dep, hook) for hook in dep.deps_hooks])
     self._pre_deps_hooks.extend([(dep, hook) for hook in dep.pre_deps_hooks])
 
+    if dep_os:
+      if dep.deps_hooks:
+        self._hooks_os.setdefault(dep_os, []).extend(
+            [(dep, hook) for hook in dep.deps_hooks])
+    else:
+      self._hooks.extend([(dep, hook) for hook in dep.deps_hooks])
+
+    for sub_dep in dep.dependencies:
+      if dep_os:
+        self._add_os_dep(sub_dep, dep_os)
+      else:
+        self._add_dep(sub_dep)
+
     for hook_os, os_hooks in dep.os_deps_hooks.iteritems():
       self._hooks_os.setdefault(hook_os, []).extend(
           [(dep, hook) for hook in os_hooks])
 
-    self._add_deps_os(dep)
-
-    deps_by_name = dict((d.name, d) for d in dep.dependencies)
-    for recurse_dep_name in (dep.recursedeps or []):
-      self._flatten_recurse(deps_by_name[recurse_dep_name])
-
-  def _flatten_recurse(self, dep):
-    """Helper for flatten that recurses into |dep|'s dependencies.
-
-    Arguments:
-      dep (Dependency): dependency to process
-    """
-    self._add_deps_os(dep)
-
-    for sub_dep in dep.dependencies:
-      self._flatten_dep(sub_dep)
-
-  def _add_deps_os(self, dep):
-    """Helper for flatten that collects deps_os from |dep|.
+    for sub_dep_os, os_deps in dep.os_dependencies.iteritems():
+      for os_dep in os_deps:
+        self._add_os_dep(os_dep, sub_dep_os)
 
-    Arguments:
-      dep (Dependency): dependency to process
-    """
-    for dep_os, os_deps in dep.os_dependencies.iteritems():
+    # Process recursedeps. |deps_by_name| is a map where keys are dependency
+    # names, and values are maps of OS names to |Dependency| instances.
+    # |None| in place of OS name means the dependency is not OS-specific.
+    deps_by_name = dict((d.name, {None: d}) for d in dep.dependencies)
+    for sub_dep_os, os_deps in dep.os_dependencies.iteritems():
       for os_dep in os_deps:
-        self._deps_os.setdefault(dep_os, {})[os_dep.name] = os_dep
+        assert sub_dep_os not in deps_by_name.get(os_dep.name, {}), (
+            os_dep.name, sub_dep_os)
+        deps_by_name.setdefault(os_dep.name, {})[sub_dep_os] = os_dep
+    for recurse_dep_name in (dep.recursedeps or []):
+      dep_info = deps_by_name[recurse_dep_name]
+      for sub_dep_os, os_dep in dep_info.iteritems():
+        self._flatten_dep(os_dep, dep_os=(sub_dep_os or dep_os))
 
 
 def CMDflatten(parser, args):
@@ -1824,6 +1892,7 @@ def CMDflatten(parser, args):
 
   options.do_not_merge_os_specific_entries = True
   options.nohooks = True
+  options.process_all_deps = True
   client = GClient.LoadCurrentConfig(options)
 
   # Only print progress if we're writing to a file. Otherwise, progress updates
@@ -1875,7 +1944,7 @@ def _DepsToLines(deps):
     s.extend([
         '  # %s' % dep.hierarchy(include_url=False),
         '  "%s": {' % (name,),
-        '    "url": "%s",' % (dep.url,),
+        '    "url": "%s",' % (dep.raw_url,),
     ] + condition_part + [
         '  },',
         '',
@@ -1897,7 +1966,7 @@ def _DepsOsToLines(deps_os):
       s.extend([
           '    # %s' % dep.hierarchy(include_url=False),
           '    "%s": {' % (name,),
-          '      "url": "%s",' % (dep.url,),
+          '      "url": "%s",' % (dep.raw_url,),
       ] + condition_part + [
           '    },',
           '',
@@ -2043,10 +2112,6 @@ def CMDconfig(parser, args):
                          'to have the main solution untouched by gclient '
                          '(gclient will check out unmanaged dependencies but '
                          'will never sync them)')
-  parser.add_option('--cache-dir',
-                    help='(git only) Cache all git repos into this dir and do '
-                         'shared clones from the cache, instead of cloning '
-                         'directly from the remote. (experimental)')
   parser.set_defaults(config_filename=None)
   (options, args) = parser.parse_args(args)
   if options.output_config_file:
@@ -2197,6 +2262,9 @@ def CMDsync(parser, args):
   parser.add_option('--do-not-merge-os-specific-entries', action='store_true',
                     help='INTERNAL ONLY - disables merging of deps_os and '
                          'hooks_os to dependencies and hooks')
+  parser.add_option('--process-all-deps', action='store_true',
+                    help='Check out all deps, even for different OS-es, '
+                         'or with conditions evaluating to false')
   parser.add_option('--upstream', action='store_true',
                     help='Make repo state match upstream branch.')
   parser.add_option('--output-json',
@@ -2417,6 +2485,12 @@ class OptionParser(optparse.OptionParser):
         '--spec',
         help='create a gclient file containing the provided string. Due to '
             'Cygwin/Python brokenness, it can\'t contain any newlines.')
+    self.add_option(
+        '--cache-dir',
+        help='(git only) Cache all git repos into this dir and do '
+             'shared clones from the cache, instead of cloning '
+             'directly from the remote. (experimental)',
+        default=os.environ.get('GCLIENT_CACHE_DIR'))
     self.add_option(
         '--no-nag-max', default=False, action='store_true',
         help='Ignored for backwards compatibility.')