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

Side by Side Diff: chrome/chrome.gyp

Issue 604061: Roll gyp DEPS, and mostly revert r38366 which was fixed better in gyp. (Closed)
Patch Set: Created 10 years, 10 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 | « build/util/build_util.gyp ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 }, { # else branding!="Chrome" 1402 }, { # else branding!="Chrome"
1403 'variables': { 1403 'variables': {
1404 'branding_path': 'app/theme/chromium/BRANDING', 1404 'branding_path': 'app/theme/chromium/BRANDING',
1405 }, 1405 },
1406 }], 1406 }],
1407 ], 1407 ],
1408 'inputs': [ 1408 'inputs': [
1409 '<(template_input_path)', 1409 '<(template_input_path)',
1410 '<(version_path)', 1410 '<(version_path)',
1411 '<(branding_path)', 1411 '<(branding_path)',
1412 '<(lastchange_path)',
1412 ], 1413 ],
1413 'outputs': [ 1414 'outputs': [
1414 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_versio n.rc', 1415 '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_versio n.rc',
1415 ], 1416 ],
1416 'action': [ 1417 'action': [
1417 'python', 1418 'python',
1418 '<(version_py_path)', 1419 '<(version_py_path)',
1419 '-f', '<(version_path)', 1420 '-f', '<(version_path)',
1420 '-f', '<(branding_path)', 1421 '-f', '<(branding_path)',
1421 '-f', '<(lastchange_path)', 1422 '-f', '<(lastchange_path)',
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 }], # targets 1610 }], # targets
1610 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" 1611 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd"
1611 ], # 'conditions' 1612 ], # 'conditions'
1612 } 1613 }
1613 1614
1614 # Local Variables: 1615 # Local Variables:
1615 # tab-width:2 1616 # tab-width:2
1616 # indent-tabs-mode:nil 1617 # indent-tabs-mode:nil
1617 # End: 1618 # End:
1618 # vim: set expandtab tabstop=2 shiftwidth=2: 1619 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/util/build_util.gyp ('k') | chrome/installer/installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698