From 19f60a5a8d524ae49e0345b49000b5d526ebecf6 Mon Sep 17 00:00:00 2001
From: "mmoss@google.com"
 <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 17 Feb 2010 16:49:27 +0000
Subject: Roll gyp DEPS, and mostly revert r38366 which was fixed better in
 gyp.

This properly triggers build targets that depend on "always run" actions.

BUG=22044

Review URL: http://codereview.chromium.org/604061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39223 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/base.gyp                       | 4 +---
 build/util/build_util.gyp           | 1 +
 chrome/chrome.gyp                   | 1 +
 chrome/installer/installer.gyp      | 8 ++------
 chrome/installer/mini_installer.gyp | 4 +---
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/base/base.gyp b/base/base.gyp
index 7915d83..8e941a3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -298,13 +298,11 @@
                 '<(template_input_path)',
                 '<(version_path)',
                 '<(branding_path)',
+                '<(lastchange_path)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h',
               ],
-              'dependencies': [
-                '../../build/util/build_util.gyp:lastchange',
-              ],
               'action': [
                 'python',
                 '<(version_py_path)',
diff --git a/build/util/build_util.gyp b/build/util/build_util.gyp
index f747557..a909177 100644
--- a/build/util/build_util.gyp
+++ b/build/util/build_util.gyp
@@ -21,6 +21,7 @@
           ],
           'outputs': [
             '<(lastchange_out_path).always',
+            '<(lastchange_out_path)',
           ],
           'action': [
             'python', '<@(_inputs)',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3c21677..f5dc08d 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1411,6 +1411,7 @@
                 '<(template_input_path)',
                 '<(version_path)',
                 '<(branding_path)',
+                '<(lastchange_path)',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 00883543..818817d 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -224,6 +224,7 @@
               'inputs': [
                 '<(template_input_path)',
                 '<(version_path)',
+                '<(lastchange_path)',
                 '<(branding_dir)/BRANDING',
               ],
               'outputs': [
@@ -237,9 +238,6 @@
                 '<(template_input_path)',
                 '<@(_outputs)',
               ],
-              'dependencies': [
-                '../../build/util/build_util.gyp:lastchange',
-              ],
               'process_outputs_as_sources': 1,
               'message': 'Generating version information'
             },
@@ -428,6 +426,7 @@
               'inputs': [
                 '<(branding_dir)/BRANDING',
                 '<(version_path)',
+                '<(lastchange_path)',
               ],
               'outputs': [
                 '<(PRODUCT_DIR)/installer/version.txt',
@@ -440,9 +439,6 @@
                 '-f', '<(lastchange_path)',
                 '-o', '<@(_outputs)'
               ],
-              'dependencies': [
-                '../../build/util/build_util.gyp:lastchange',
-              ],
             },
           ],
         },
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index a549b7b..762df0a 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -113,14 +113,12 @@
             'inputs': [
               '<(template_input_path)',
               '<(version_path)',
+              '<(lastchange_path)',
               '<(branding_dir)/BRANDING',
             ],
             'outputs': [
               '<(INTERMEDIATE_DIR)/mini_installer_exe_version.rc',
             ],
-            'dependencies': [
-              '../../build/util/build_util.gyp:lastchange',
-            ],
             'action': [
               'python', '<(version_py)',
               '-f', '<(version_path)',
-- 
cgit v1.1