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

Side by Side Diff: chrome/chrome.gyp

Issue 7584007: make bubble_border to use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: add missing chrome.gyp change Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 1599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1610 ['touchui==0', { 1610 ['touchui==0', {
1611 'pak_inputs': [ 1611 'pak_inputs': [
1612 '<(grit_out_dir)/theme_resources_standard.pak', 1612 '<(grit_out_dir)/theme_resources_standard.pak',
1613 ], 1613 ],
1614 }, { # else: touchui!=0 1614 }, { # else: touchui!=0
1615 'pak_inputs': [ 1615 'pak_inputs': [
1616 '<(grit_out_dir)/theme_resources_large.pak', 1616 '<(grit_out_dir)/theme_resources_large.pak',
1617 ], 1617 ],
1618 }], 1618 }],
1619 ], 1619 ],
1620 'conditions': [
1621 ['touchui!=0', {
1622 'pak_inputs': [
1623 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_large/ui_resourc es_large.pak',
sky 2011/08/08 16:23:35 Can this be put at line 1617 and the new condition
alicet1 2011/08/09 08:12:26 Done.
1624 ],
1625 }],
1626 ],
1620 }, 1627 },
1621 'inputs': [ 1628 'inputs': [
1622 '<(repack_path)', 1629 '<(repack_path)',
1623 '<@(pak_inputs)', 1630 '<@(pak_inputs)',
1624 ], 1631 ],
1625 'outputs': [ 1632 'outputs': [
1626 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 1633 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
1627 ], 1634 ],
1628 'action': ['python', '<(repack_path)', '<@(_outputs)', 1635 'action': ['python', '<(repack_path)', '<@(_outputs)',
1629 '<@(pak_inputs)'], 1636 '<@(pak_inputs)'],
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1673 'destination': '<(PRODUCT_DIR)', 1680 'destination': '<(PRODUCT_DIR)',
1674 'files': [ 1681 'files': [
1675 '<(INTERMEDIATE_DIR)/repack/chrome.pak' 1682 '<(INTERMEDIATE_DIR)/repack/chrome.pak'
1676 ], 1683 ],
1677 }, 1684 },
1678 ], 1685 ],
1679 }], # targets 1686 }], # targets
1680 }], # os_posix == 1 and OS != "mac" 1687 }], # os_posix == 1 and OS != "mac"
1681 ], # 'conditions' 1688 ], # 'conditions'
1682 } 1689 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698