diff options
| author | satorux <satorux@chromium.org> | 2015-02-12 17:56:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 01:57:36 +0000 |
| commit | 72c7409fa56a30e34a747a74143025c3e4b5d3ae (patch) | |
| tree | 38477a6352c28b3f6d2090dc462dabbcd7c791e3 /chrome/installer | |
| parent | c1f8c4ef02da286ecce8111dd4415515d74c8419 (diff) | |
| download | chromium_src-72c7409fa56a30e34a747a74143025c3e4b5d3ae.zip chromium_src-72c7409fa56a30e34a747a74143025c3e4b5d3ae.tar.gz chromium_src-72c7409fa56a30e34a747a74143025c3e4b5d3ae.tar.bz2 | |
Sort GYP files under chrome sub directories using tools/sort_sources.py
GYP files directly under chrome were sorted in crrev.com/315927
The patch is to sort smaller GYP files in sub directories.
Also fix a bug where rc.version, ico, def, release suffixes weren't handled
correctly.
BUG=456014
TEST=everything should build as before
Review URL: https://codereview.chromium.org/914243003
Cr-Commit-Position: refs/heads/master@{#316127}
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/installer_tools.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer.gypi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/installer_tools.gyp b/chrome/installer/installer_tools.gyp index b9508fd..fea3d48 100644 --- a/chrome/installer/installer_tools.gyp +++ b/chrome/installer/installer_tools.gyp @@ -27,8 +27,8 @@ '<(DEPTH)', ], 'sources': [ - 'tools/validate_installation_main.cc', 'tools/validate_installation.rc', + 'tools/validate_installation_main.cc', 'tools/validate_installation_resource.h', ], }, diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 128ed26..45d82a3 100644 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -32,6 +32,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome', ], 'sources': [ + '<(INTERMEDIATE_DIR)/packed_files.rc', 'mini_installer/appid.h', 'mini_installer/chrome.release', 'mini_installer/chrome_appid.cc', @@ -51,7 +52,6 @@ 'mini_installer/mini_string.h', 'mini_installer/pe_resource.cc', 'mini_installer/pe_resource.h', - '<(INTERMEDIATE_DIR)/packed_files.rc', ], 'msvs_settings': { 'VCCLCompilerTool': { diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi index 1c79acf..57eaf03 100644 --- a/chrome/installer/mini_installer.gypi +++ b/chrome/installer/mini_installer.gypi @@ -15,6 +15,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome', ], 'sources': [ + '<(INTERMEDIATE_DIR)/packed_files.rc', 'mini_installer/appid.h', 'mini_installer/chrome.release', 'mini_installer/chrome_appid.cc', @@ -34,7 +35,6 @@ 'mini_installer/mini_string.h', 'mini_installer/pe_resource.cc', 'mini_installer/pe_resource.h', - '<(INTERMEDIATE_DIR)/packed_files.rc', ], # Disable precompiled headers for this project, to avoid # linker errors when building with VS 2008. |