Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Side by Side Diff: chrome/installer/installer.gyp

Issue 196045: Rolling back 25652. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 }, 7 },
8 'includes': [ 8 'includes': [
9 '../../build/common.gypi', 9 '../../build/common.gypi',
10 ], 10 ],
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 # matching path names internally. 184 # matching path names internally.
185 'action_name': 'installer_util_strings', 185 'action_name': 'installer_util_strings',
186 'inputs': [ 186 'inputs': [
187 'util/prebuild/create_string_rc.py', 187 'util/prebuild/create_string_rc.py',
188 '../app/generated_resources.grd', 188 '../app/generated_resources.grd',
189 ], 189 ],
190 'outputs': [ 190 'outputs': [
191 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.rc', 191 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.rc',
192 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.h', 192 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti l_strings.h',
193 ], 193 ],
194 'msvs_quote_cmd': 0,
195 'action': [ 194 'action': [
196 # The create_string_rc.py script requires the checked-in 195 # The create_string_rc.py script requires the checked-in
197 # python.exe that has google modules installed, and 196 # python.exe that has google modules installed, and
198 # a PYTHONPATH pointing to grit so it can import FP. 197 # a PYTHONPATH pointing to grit so it can import FP.
199 # TODO: clean this up 198 # TODO: clean this up
200 'set PYTHONPATH=../../tools/grit/grit/extern', '&&', 199 'set PYTHONPATH=../../tools/grit/grit/extern', '&&',
201 '../../third_party/python_24/python.exe', 200 '../../third_party/python_24/python.exe',
202 'util/prebuild/create_string_rc.py', 201 'util/prebuild/create_string_rc.py',
203 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings' 202 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings'
204 ], 203 ],
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 'variables': { 626 'variables': {
628 'branding_dir': '../app/theme/google_chrome', 627 'branding_dir': '../app/theme/google_chrome',
629 }, 628 },
630 }, { # else branding!="Chrome" 629 }, { # else branding!="Chrome"
631 'variables': { 630 'variables': {
632 'branding_dir': '../app/theme/chromium', 631 'branding_dir': '../app/theme/chromium',
633 }, 632 },
634 }], 633 }],
635 ], 634 ],
636 } 635 }
OLDNEW
« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698