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

Side by Side Diff: build/common.gypi

Issue 10082020: Metro/HiDPI: Use metro resource pak in metro mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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/app/theme/theme_resources_metro_1x.grd » ('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 25 matching lines...) Expand all
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 43
44 # Enable HiDPI support. 44 # Enable HiDPI support.
45 'enable_hidpi%': 0, 45 'enable_hidpi%': 0,
46
47 # Enable Metro support.
48 'enable_metro%': 0,
46 }, 49 },
47 # Copy conditionally-set variables out one scope. 50 # Copy conditionally-set variables out one scope.
48 'chromeos%': '<(chromeos)', 51 'chromeos%': '<(chromeos)',
49 'use_aura%': '<(use_aura)', 52 'use_aura%': '<(use_aura)',
50 'use_ash%': '<(use_ash)', 53 'use_ash%': '<(use_ash)',
51 'enable_dip%': '<(enable_dip)', 54 'enable_dip%': '<(enable_dip)',
52 'use_openssl%': '<(use_openssl)', 55 'use_openssl%': '<(use_openssl)',
53 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 56 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
54 'enable_viewport%': '<(enable_viewport)', 57 'enable_viewport%': '<(enable_viewport)',
55 'enable_hidpi%': '<(enable_hidpi)', 58 'enable_hidpi%': '<(enable_hidpi)',
59 'enable_metro%': '<(enable_metro)',
56 60
57 # Compute the architecture that we're building on. 61 # Compute the architecture that we're building on.
58 'conditions': [ 62 'conditions': [
59 [ 'OS=="win" or OS=="mac"', { 63 [ 'OS=="win" or OS=="mac"', {
60 'host_arch%': 'ia32', 64 'host_arch%': 'ia32',
61 }, { 65 }, {
62 # This handles the Unix platforms for which there is some support. 66 # This handles the Unix platforms for which there is some support.
63 # Anything else gets passed through, which probably won't work very 67 # Anything else gets passed through, which probably won't work very
64 # well; such hosts should pass an explicit target_arch to gyp. 68 # well; such hosts should pass an explicit target_arch to gyp.
65 'host_arch%': 69 'host_arch%':
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 'chromeos%': '<(chromeos)', 102 'chromeos%': '<(chromeos)',
99 'host_arch%': '<(host_arch)', 103 'host_arch%': '<(host_arch)',
100 'toolkit_views%': '<(toolkit_views)', 104 'toolkit_views%': '<(toolkit_views)',
101 'use_aura%': '<(use_aura)', 105 'use_aura%': '<(use_aura)',
102 'use_ash%': '<(use_ash)', 106 'use_ash%': '<(use_ash)',
103 'enable_dip%': '<(enable_dip)', 107 'enable_dip%': '<(enable_dip)',
104 'use_openssl%': '<(use_openssl)', 108 'use_openssl%': '<(use_openssl)',
105 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 109 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
106 'enable_viewport%': '<(enable_viewport)', 110 'enable_viewport%': '<(enable_viewport)',
107 'enable_hidpi%': '<(enable_hidpi)', 111 'enable_hidpi%': '<(enable_hidpi)',
112 'enable_metro%': '<(enable_metro)',
108 113
109 # We used to provide a variable for changing how libraries were built. 114 # We used to provide a variable for changing how libraries were built.
110 # This variable remains until we can clean up all the users. 115 # This variable remains until we can clean up all the users.
111 # This needs to be one nested variables dict in so that dependent 116 # This needs to be one nested variables dict in so that dependent
112 # gyp files can make use of it in their outer variables. (Yikes!) 117 # gyp files can make use of it in their outer variables. (Yikes!)
113 # http://code.google.com/p/chromium/issues/detail?id=83308 118 # http://code.google.com/p/chromium/issues/detail?id=83308
114 'library%': 'static_library', 119 'library%': 'static_library',
115 120
116 # Override branding to select the desired branding flavor. 121 # Override branding to select the desired branding flavor.
117 'branding%': 'Chromium', 122 'branding%': 'Chromium',
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 501 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
497 'use_skia%': '<(use_skia)', 502 'use_skia%': '<(use_skia)',
498 'use_x11%': '<(use_x11)', 503 'use_x11%': '<(use_x11)',
499 'use_gnome_keyring%': '<(use_gnome_keyring)', 504 'use_gnome_keyring%': '<(use_gnome_keyring)',
500 'linux_fpic%': '<(linux_fpic)', 505 'linux_fpic%': '<(linux_fpic)',
501 'enable_pepper_threading%': '<(enable_pepper_threading)', 506 'enable_pepper_threading%': '<(enable_pepper_threading)',
502 'chromeos%': '<(chromeos)', 507 'chromeos%': '<(chromeos)',
503 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 508 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
504 'enable_viewport%': '<(enable_viewport)', 509 'enable_viewport%': '<(enable_viewport)',
505 'enable_hidpi%': '<(enable_hidpi)', 510 'enable_hidpi%': '<(enable_hidpi)',
511 'enable_metro%': '<(enable_metro)',
506 'use_xi2_mt%':'<(use_xi2_mt)', 512 'use_xi2_mt%':'<(use_xi2_mt)',
507 'file_manager_extension%': '<(file_manager_extension)', 513 'file_manager_extension%': '<(file_manager_extension)',
508 'webui_task_manager%': '<(webui_task_manager)', 514 'webui_task_manager%': '<(webui_task_manager)',
509 'inside_chromium_build%': '<(inside_chromium_build)', 515 'inside_chromium_build%': '<(inside_chromium_build)',
510 'fastbuild%': '<(fastbuild)', 516 'fastbuild%': '<(fastbuild)',
511 'dcheck_always_on%': '<(dcheck_always_on)', 517 'dcheck_always_on%': '<(dcheck_always_on)',
512 'python_ver%': '<(python_ver)', 518 'python_ver%': '<(python_ver)',
513 'armv7%': '<(armv7)', 519 'armv7%': '<(armv7)',
514 'arm_neon%': '<(arm_neon)', 520 'arm_neon%': '<(arm_neon)',
515 'sysroot%': '<(sysroot)', 521 'sysroot%': '<(sysroot)',
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1294 }], 1300 }],
1295 ['input_speech==1', { 1301 ['input_speech==1', {
1296 'defines': ['ENABLE_INPUT_SPEECH'], 1302 'defines': ['ENABLE_INPUT_SPEECH'],
1297 }], 1303 }],
1298 ['notifications==1', { 1304 ['notifications==1', {
1299 'defines': ['ENABLE_NOTIFICATIONS'], 1305 'defines': ['ENABLE_NOTIFICATIONS'],
1300 }], 1306 }],
1301 ['enable_hidpi==1', { 1307 ['enable_hidpi==1', {
1302 'defines': ['ENABLE_HIDPI=1'], 1308 'defines': ['ENABLE_HIDPI=1'],
1303 }], 1309 }],
1310 ['enable_metro==1', {
1311 'defines': ['ENABLE_METRO=1'],
1312 }],
1304 ['fastbuild!=0', { 1313 ['fastbuild!=0', {
1305 1314
1306 'conditions': [ 1315 'conditions': [
1307 # For Windows and Mac, we don't genererate debug information. 1316 # For Windows and Mac, we don't genererate debug information.
1308 ['OS=="win" or OS=="mac"', { 1317 ['OS=="win" or OS=="mac"', {
1309 'msvs_settings': { 1318 'msvs_settings': {
1310 'VCLinkerTool': { 1319 'VCLinkerTool': {
1311 'GenerateDebugInformation': 'false', 1320 'GenerateDebugInformation': 'false',
1312 }, 1321 },
1313 'VCCLCompilerTool': { 1322 'VCCLCompilerTool': {
(...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 # 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
3031 # Xcode variables depend on it, including variables such as 3040 # Xcode variables depend on it, including variables such as
3032 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3041 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3033 # 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
3034 # 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
3035 # 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,
3036 # and therefore SYMROOT, needs to be set at the project level. 3045 # and therefore SYMROOT, needs to be set at the project level.
3037 'SYMROOT': '<(DEPTH)/xcodebuild', 3046 'SYMROOT': '<(DEPTH)/xcodebuild',
3038 }, 3047 },
3039 } 3048 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources_metro_1x.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698