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

Side by Side Diff: build/common.gypi

Issue 10262012: Fix mini_installer for Metro resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
« no previous file with comments | « no previous file | chrome/installer/mini_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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 26 matching lines...) Expand all
37 37
38 # Disable Virtual keyboard support by default. 38 # Disable Virtual keyboard support by default.
39 'use_virtual_keyboard%': 0, 39 'use_virtual_keyboard%': 0,
40 40
41 # Disable viewport meta tag by default. 41 # Disable viewport meta tag by default.
42 'enable_viewport%': 0, 42 'enable_viewport%': 0,
43 43
44 # Enable HiDPI support. 44 # Enable HiDPI support.
45 'enable_hidpi%': 0, 45 'enable_hidpi%': 0,
46 46
47 # Enable Metro support. 47 # Enable inclusion (and therefore use) of touch-optimized assets in th e build.
grt (UTC plus 2) 2012/05/02 13:17:38 nit: 80 columns
48 # TODO(joi): Rename to enable_touch_assets.
48 'enable_metro%': 0, 49 'enable_metro%': 0,
49 }, 50 },
50 # Copy conditionally-set variables out one scope. 51 # Copy conditionally-set variables out one scope.
51 'chromeos%': '<(chromeos)', 52 'chromeos%': '<(chromeos)',
52 'use_aura%': '<(use_aura)', 53 'use_aura%': '<(use_aura)',
53 'use_ash%': '<(use_ash)', 54 'use_ash%': '<(use_ash)',
54 'enable_dip%': '<(enable_dip)', 55 'enable_dip%': '<(enable_dip)',
55 'use_openssl%': '<(use_openssl)', 56 'use_openssl%': '<(use_openssl)',
56 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 57 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
57 'enable_viewport%': '<(enable_viewport)', 58 'enable_viewport%': '<(enable_viewport)',
(...skipping 30 matching lines...) Expand all
88 ['OS=="win" or chromeos==1 or use_aura==1', { 89 ['OS=="win" or chromeos==1 or use_aura==1', {
89 'toolkit_views%': 1, 90 'toolkit_views%': 1,
90 }, { 91 }, {
91 'toolkit_views%': 0, 92 'toolkit_views%': 0,
92 }], 93 }],
93 94
94 # Enable HiDPI on Mac OS. 95 # Enable HiDPI on Mac OS.
95 ['OS=="mac"', { 96 ['OS=="mac"', {
96 'enable_hidpi%': 1, 97 'enable_hidpi%': 1,
97 }], 98 }],
99
100 # Touch-optimized resources are enabled by default on Windows.
101 ['OS=="win"', {
102 'enable_metro%': 1,
grt (UTC plus 2) 2012/05/02 13:17:38 this will cause theme_resources_metro_1x.pak to st
103 }],
98 ], 104 ],
99 }, 105 },
100 106
101 # Copy conditionally-set variables out one scope. 107 # Copy conditionally-set variables out one scope.
102 'chromeos%': '<(chromeos)', 108 'chromeos%': '<(chromeos)',
103 'host_arch%': '<(host_arch)', 109 'host_arch%': '<(host_arch)',
104 'toolkit_views%': '<(toolkit_views)', 110 'toolkit_views%': '<(toolkit_views)',
105 'use_aura%': '<(use_aura)', 111 'use_aura%': '<(use_aura)',
106 'use_ash%': '<(use_ash)', 112 'use_ash%': '<(use_ash)',
107 'enable_dip%': '<(enable_dip)', 113 'enable_dip%': '<(enable_dip)',
(...skipping 2925 matching lines...) Expand 10 before | Expand all | Expand 10 after
3033 # settings in target dicts. SYMROOT is a special case, because many other 3039 # settings in target dicts. SYMROOT is a special case, because many other
3034 # Xcode variables depend on it, including variables such as 3040 # Xcode variables depend on it, including variables such as
3035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3041 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3042 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3037 # files to appear (when present) in the UI as actual files and not red 3043 # files to appear (when present) in the UI as actual files and not red
3038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3044 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3039 # and therefore SYMROOT, needs to be set at the project level. 3045 # and therefore SYMROOT, needs to be set at the project level.
3040 'SYMROOT': '<(DEPTH)/xcodebuild', 3046 'SYMROOT': '<(DEPTH)/xcodebuild',
3041 }, 3047 },
3042 } 3048 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698