Reapply r922 with the dependencies reversed.

pylib/gyp/input.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 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.
 
 from compiler.ast import Const
 from compiler.ast import Dict
 from compiler.ast import Discard
 from compiler.ast import List
@@ skipping 1527 matching lines @@
       # present.
 
       link_dependencies = dependency_nodes[target].LinkDependencies(targets)
       for dependency in link_dependencies:
         if dependency == target:
           continue
         if not 'dependencies' in target_dict:
           target_dict['dependencies'] = []
         if not dependency in target_dict['dependencies']:
           target_dict['dependencies'].append(dependency)
+      # Sort the dependencies list in the order from dependents to dependencies.
+      # e.g. If A and B depend on C and C depends on D, sort them in A, B, C, D.
+      # Note: flat_list is already sorted in the order from dependencies to
+      # dependents.
+      if 'dependencies' in target_dict:
+        target_dict['dependencies'] = [
+            dep for dep in flat_list if dep in target_dict['dependencies']]
+
+        # The final step to implement the above algorithm would be to reverse
+        # the dependencies:
+        #   target_dict['dependencies'].reverse()
+        # as an experiment, leave this out so we can measure its impact on
+        # build performance.
+
 
 # Initialize this here to speed up MakePathRelative.
 exception_re = re.compile(r'''["']?[-/$<>]''')
 
 
 def MakePathRelative(to_file, fro_file, item):
   # If item is a relative path, it's relative to the build file dict that it's
   # coming from.  Fix it up to make it relative to the build file dict that
   # it's going into.
   # Exception: any |item| that begins with these special characters is
@@ skipping 734 matching lines @@
     ValidateRunAsInTarget(target, target_dict, build_file)
     ValidateActionsInTarget(target, target_dict, build_file)
 
   # Generators might not expect ints.  Turn them into strs.
   TurnIntIntoStrInDict(data)
 
   # TODO(mark): Return |data| for now because the generator needs a list of
   # build files that came in.  In the future, maybe it should just accept
   # a list, and not the whole data dict.
   return [flat_list, targets, data]