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

Side by Side Diff: build/common.gypi

Issue 10024050: Metro/HiDPI: Move 1x icons into separate pak file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clobber build Created 8 years, 8 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/chrome_dll.gypi » ('j') | ui/base/resource/resource_bundle_mac.mm » ('J')
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 22 matching lines...) Expand all
33 'enable_dip%': 0, 33 'enable_dip%': 0,
34 34
35 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 35 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
36 'use_openssl%': 0, 36 'use_openssl%': 0,
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
44 # Enable HiDPI support.
45 'enable_hidpi%': 0,
Nico 2012/04/23 15:51:25 Do you need to put this in the innermost variables
43 }, 46 },
44 # Copy conditionally-set variables out one scope. 47 # Copy conditionally-set variables out one scope.
45 'chromeos%': '<(chromeos)', 48 'chromeos%': '<(chromeos)',
46 'use_aura%': '<(use_aura)', 49 'use_aura%': '<(use_aura)',
47 'use_ash%': '<(use_ash)', 50 'use_ash%': '<(use_ash)',
48 'enable_dip%': '<(enable_dip)', 51 'enable_dip%': '<(enable_dip)',
49 'use_openssl%': '<(use_openssl)', 52 'use_openssl%': '<(use_openssl)',
50 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 53 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
51 'enable_viewport%': '<(enable_viewport)', 54 'enable_viewport%': '<(enable_viewport)',
55 'enable_hidpi%': '<(enable_hidpi)',
52 56
53 # Compute the architecture that we're building on. 57 # Compute the architecture that we're building on.
54 'conditions': [ 58 'conditions': [
55 [ 'OS=="win" or OS=="mac"', { 59 [ 'OS=="win" or OS=="mac"', {
56 'host_arch%': 'ia32', 60 'host_arch%': 'ia32',
57 }, { 61 }, {
58 # This handles the Unix platforms for which there is some support. 62 # This handles the Unix platforms for which there is some support.
59 # Anything else gets passed through, which probably won't work very 63 # Anything else gets passed through, which probably won't work very
60 # well; such hosts should pass an explicit target_arch to gyp. 64 # well; such hosts should pass an explicit target_arch to gyp.
61 'host_arch%': 65 'host_arch%':
(...skipping 13 matching lines...) Expand all
75 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', { 79 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
76 'use_ash%': 1, 80 'use_ash%': 1,
77 }], 81 }],
78 82
79 # Set default value of toolkit_views based on OS. 83 # Set default value of toolkit_views based on OS.
80 ['OS=="win" or chromeos==1 or use_aura==1', { 84 ['OS=="win" or chromeos==1 or use_aura==1', {
81 'toolkit_views%': 1, 85 'toolkit_views%': 1,
82 }, { 86 }, {
83 'toolkit_views%': 0, 87 'toolkit_views%': 0,
84 }], 88 }],
89
90 # Enable HiDPI on Mac OS.
91 ['OS=="mac"', {
92 'enable_hidpi%': 1,
93 }],
85 ], 94 ],
86 }, 95 },
87 96
88 # Copy conditionally-set variables out one scope. 97 # Copy conditionally-set variables out one scope.
89 'chromeos%': '<(chromeos)', 98 'chromeos%': '<(chromeos)',
90 'host_arch%': '<(host_arch)', 99 'host_arch%': '<(host_arch)',
91 'toolkit_views%': '<(toolkit_views)', 100 'toolkit_views%': '<(toolkit_views)',
92 'use_aura%': '<(use_aura)', 101 'use_aura%': '<(use_aura)',
93 'use_ash%': '<(use_ash)', 102 'use_ash%': '<(use_ash)',
94 'enable_dip%': '<(enable_dip)', 103 'enable_dip%': '<(enable_dip)',
95 'use_openssl%': '<(use_openssl)', 104 'use_openssl%': '<(use_openssl)',
96 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 105 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
97 'enable_viewport%': '<(enable_viewport)', 106 'enable_viewport%': '<(enable_viewport)',
107 'enable_hidpi%': '<(enable_hidpi)',
98 108
99 # We used to provide a variable for changing how libraries were built. 109 # We used to provide a variable for changing how libraries were built.
100 # This variable remains until we can clean up all the users. 110 # This variable remains until we can clean up all the users.
101 # This needs to be one nested variables dict in so that dependent 111 # This needs to be one nested variables dict in so that dependent
102 # gyp files can make use of it in their outer variables. (Yikes!) 112 # gyp files can make use of it in their outer variables. (Yikes!)
103 # http://code.google.com/p/chromium/issues/detail?id=83308 113 # http://code.google.com/p/chromium/issues/detail?id=83308
104 'library%': 'static_library', 114 'library%': 'static_library',
105 115
106 # Override branding to select the desired branding flavor. 116 # Override branding to select the desired branding flavor.
107 'branding%': 'Chromium', 117 'branding%': 'Chromium',
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 'use_glib%': '<(use_glib)', 490 'use_glib%': '<(use_glib)',
481 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 491 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
482 'use_skia%': '<(use_skia)', 492 'use_skia%': '<(use_skia)',
483 'use_x11%': '<(use_x11)', 493 'use_x11%': '<(use_x11)',
484 'use_gnome_keyring%': '<(use_gnome_keyring)', 494 'use_gnome_keyring%': '<(use_gnome_keyring)',
485 'linux_fpic%': '<(linux_fpic)', 495 'linux_fpic%': '<(linux_fpic)',
486 'enable_pepper_threading%': '<(enable_pepper_threading)', 496 'enable_pepper_threading%': '<(enable_pepper_threading)',
487 'chromeos%': '<(chromeos)', 497 'chromeos%': '<(chromeos)',
488 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 498 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
489 'enable_viewport%': '<(enable_viewport)', 499 'enable_viewport%': '<(enable_viewport)',
500 'enable_hidpi%': '<(enable_hidpi)',
490 'use_xi2_mt%':'<(use_xi2_mt)', 501 'use_xi2_mt%':'<(use_xi2_mt)',
491 'file_manager_extension%': '<(file_manager_extension)', 502 'file_manager_extension%': '<(file_manager_extension)',
492 'webui_task_manager%': '<(webui_task_manager)', 503 'webui_task_manager%': '<(webui_task_manager)',
493 'inside_chromium_build%': '<(inside_chromium_build)', 504 'inside_chromium_build%': '<(inside_chromium_build)',
494 'fastbuild%': '<(fastbuild)', 505 'fastbuild%': '<(fastbuild)',
495 'dcheck_always_on%': '<(dcheck_always_on)', 506 'dcheck_always_on%': '<(dcheck_always_on)',
496 'python_ver%': '<(python_ver)', 507 'python_ver%': '<(python_ver)',
497 'armv7%': '<(armv7)', 508 'armv7%': '<(armv7)',
498 'arm_neon%': '<(arm_neon)', 509 'arm_neon%': '<(arm_neon)',
499 'sysroot%': '<(sysroot)', 510 'sysroot%': '<(sysroot)',
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 }], 1281 }],
1271 ['configuration_policy==1', { 1282 ['configuration_policy==1', {
1272 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1283 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1273 }], 1284 }],
1274 ['input_speech==1', { 1285 ['input_speech==1', {
1275 'defines': ['ENABLE_INPUT_SPEECH'], 1286 'defines': ['ENABLE_INPUT_SPEECH'],
1276 }], 1287 }],
1277 ['notifications==1', { 1288 ['notifications==1', {
1278 'defines': ['ENABLE_NOTIFICATIONS'], 1289 'defines': ['ENABLE_NOTIFICATIONS'],
1279 }], 1290 }],
1291 ['enable_hidpi==1', {
1292 'defines': ['ENABLE_HIDPI=1'],
1293 }],
1280 ['fastbuild!=0', { 1294 ['fastbuild!=0', {
1281 1295
1282 'conditions': [ 1296 'conditions': [
1283 # For Windows and Mac, we don't genererate debug information. 1297 # For Windows and Mac, we don't genererate debug information.
1284 ['OS=="win" or OS=="mac"', { 1298 ['OS=="win" or OS=="mac"', {
1285 'msvs_settings': { 1299 'msvs_settings': {
1286 'VCLinkerTool': { 1300 'VCLinkerTool': {
1287 'GenerateDebugInformation': 'false', 1301 'GenerateDebugInformation': 'false',
1288 }, 1302 },
1289 'VCCLCompilerTool': { 1303 'VCCLCompilerTool': {
(...skipping 1712 matching lines...) Expand 10 before | Expand all | Expand 10 after
3002 # settings in target dicts. SYMROOT is a special case, because many other 3016 # settings in target dicts. SYMROOT is a special case, because many other
3003 # Xcode variables depend on it, including variables such as 3017 # Xcode variables depend on it, including variables such as
3004 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3018 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3005 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3019 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3006 # files to appear (when present) in the UI as actual files and not red 3020 # files to appear (when present) in the UI as actual files and not red
3007 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3021 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3008 # and therefore SYMROOT, needs to be set at the project level. 3022 # and therefore SYMROOT, needs to be set at the project level.
3009 'SYMROOT': '<(DEPTH)/xcodebuild', 3023 'SYMROOT': '<(DEPTH)/xcodebuild',
3010 }, 3024 },
3011 } 3025 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | ui/base/resource/resource_bundle_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698