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

Side by Side Diff: build/common.gypi

Issue 10221028: Move DIP translation from ui/aura to ui/compositor (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
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 11 matching lines...) Expand all
22 22
23 # Whether we are using Views Toolkit 23 # Whether we are using Views Toolkit
24 'toolkit_views%': 0, 24 'toolkit_views%': 0,
25 25
26 # Whether or not we are using the Aura windowing framework. 26 # Whether or not we are using the Aura windowing framework.
27 'use_aura%': 0, 27 'use_aura%': 0,
28 28
29 # Whether or not we are building the Ash shell. 29 # Whether or not we are building the Ash shell.
30 'use_ash%': 0, 30 'use_ash%': 0,
31 31
32 # Enable DIP (Density Independent Pixels) support.
33 'enable_dip%': 0,
34
35 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 32 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
36 'use_openssl%': 0, 33 'use_openssl%': 0,
37 34
38 # Disable Virtual keyboard support by default. 35 # Disable Virtual keyboard support by default.
39 'use_virtual_keyboard%': 0, 36 'use_virtual_keyboard%': 0,
40 37
41 # Disable viewport meta tag by default. 38 # Disable viewport meta tag by default.
42 'enable_viewport%': 0, 39 'enable_viewport%': 0,
43 40
44 # Enable HiDPI support. 41 # Enable HiDPI support.
45 'enable_hidpi%': 0, 42 'enable_hidpi%': 0,
46 43
47 # Enable touch optimized art assets and metrics. 44 # Enable touch optimized art assets and metrics.
48 'enable_touch_ui%': 0, 45 'enable_touch_ui%': 0,
49 46
50 # Enable inclusion of touch-optimized resources. 47 # Enable inclusion of touch-optimized resources.
51 # TODO(joi): Rename to enable_touch_assets. 48 # TODO(joi): Rename to enable_touch_assets.
52 'enable_metro%': 0, 49 'enable_metro%': 0,
53 }, 50 },
54 # Copy conditionally-set variables out one scope. 51 # Copy conditionally-set variables out one scope.
55 'chromeos%': '<(chromeos)', 52 'chromeos%': '<(chromeos)',
56 'use_aura%': '<(use_aura)', 53 'use_aura%': '<(use_aura)',
57 'use_ash%': '<(use_ash)', 54 'use_ash%': '<(use_ash)',
58 'enable_dip%': '<(enable_dip)',
59 'use_openssl%': '<(use_openssl)', 55 'use_openssl%': '<(use_openssl)',
60 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 56 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
61 'enable_viewport%': '<(enable_viewport)', 57 'enable_viewport%': '<(enable_viewport)',
62 'enable_hidpi%': '<(enable_hidpi)', 58 'enable_hidpi%': '<(enable_hidpi)',
63 'enable_touch_ui%': '<(enable_touch_ui)', 59 'enable_touch_ui%': '<(enable_touch_ui)',
64 'enable_metro%': '<(enable_metro)', 60 'enable_metro%': '<(enable_metro)',
65 61
66 # Compute the architecture that we're building on. 62 # Compute the architecture that we're building on.
67 'conditions': [ 63 'conditions': [
68 [ 'OS=="win" or OS=="mac"', { 64 [ 'OS=="win" or OS=="mac"', {
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 }], 103 }],
108 ], 104 ],
109 }, 105 },
110 106
111 # Copy conditionally-set variables out one scope. 107 # Copy conditionally-set variables out one scope.
112 'chromeos%': '<(chromeos)', 108 'chromeos%': '<(chromeos)',
113 'host_arch%': '<(host_arch)', 109 'host_arch%': '<(host_arch)',
114 'toolkit_views%': '<(toolkit_views)', 110 'toolkit_views%': '<(toolkit_views)',
115 'use_aura%': '<(use_aura)', 111 'use_aura%': '<(use_aura)',
116 'use_ash%': '<(use_ash)', 112 'use_ash%': '<(use_ash)',
117 'enable_dip%': '<(enable_dip)',
118 'use_openssl%': '<(use_openssl)', 113 'use_openssl%': '<(use_openssl)',
119 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 114 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
120 'enable_viewport%': '<(enable_viewport)', 115 'enable_viewport%': '<(enable_viewport)',
121 'enable_hidpi%': '<(enable_hidpi)', 116 'enable_hidpi%': '<(enable_hidpi)',
122 'enable_touch_ui%': '<(enable_touch_ui)', 117 'enable_touch_ui%': '<(enable_touch_ui)',
123 'enable_metro%': '<(enable_metro)', 118 'enable_metro%': '<(enable_metro)',
124 119
125 # We used to provide a variable for changing how libraries were built. 120 # We used to provide a variable for changing how libraries were built.
126 # This variable remains until we can clean up all the users. 121 # This variable remains until we can clean up all the users.
127 # This needs to be one nested variables dict in so that dependent 122 # This needs to be one nested variables dict in so that dependent
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 # Copy conditionally-set variables out one scope. 494 # Copy conditionally-set variables out one scope.
500 'branding%': '<(branding)', 495 'branding%': '<(branding)',
501 'buildtype%': '<(buildtype)', 496 'buildtype%': '<(buildtype)',
502 'target_arch%': '<(target_arch)', 497 'target_arch%': '<(target_arch)',
503 'host_arch%': '<(host_arch)', 498 'host_arch%': '<(host_arch)',
504 'library%': 'static_library', 499 'library%': 'static_library',
505 'toolkit_views%': '<(toolkit_views)', 500 'toolkit_views%': '<(toolkit_views)',
506 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 501 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
507 'use_aura%': '<(use_aura)', 502 'use_aura%': '<(use_aura)',
508 'use_ash%': '<(use_ash)', 503 'use_ash%': '<(use_ash)',
509 'enable_dip%': '<(enable_dip)',
510 'use_openssl%': '<(use_openssl)', 504 'use_openssl%': '<(use_openssl)',
511 'use_nss%': '<(use_nss)', 505 'use_nss%': '<(use_nss)',
512 'os_bsd%': '<(os_bsd)', 506 'os_bsd%': '<(os_bsd)',
513 'os_posix%': '<(os_posix)', 507 'os_posix%': '<(os_posix)',
514 'use_glib%': '<(use_glib)', 508 'use_glib%': '<(use_glib)',
515 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 509 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
516 'use_skia%': '<(use_skia)', 510 'use_skia%': '<(use_skia)',
517 'use_x11%': '<(use_x11)', 511 'use_x11%': '<(use_x11)',
518 'use_gnome_keyring%': '<(use_gnome_keyring)', 512 'use_gnome_keyring%': '<(use_gnome_keyring)',
519 'linux_fpic%': '<(linux_fpic)', 513 'linux_fpic%': '<(linux_fpic)',
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1240 }], 1234 }],
1241 ['ui_compositor_image_transport==1', { 1235 ['ui_compositor_image_transport==1', {
1242 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1236 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1243 }], 1237 }],
1244 ['use_aura==1', { 1238 ['use_aura==1', {
1245 'defines': ['USE_AURA=1'], 1239 'defines': ['USE_AURA=1'],
1246 }], 1240 }],
1247 ['use_ash==1', { 1241 ['use_ash==1', {
1248 'defines': ['USE_ASH=1'], 1242 'defines': ['USE_ASH=1'],
1249 }], 1243 }],
1250 ['enable_dip==1', {
1251 'defines': ['ENABLE_DIP'],
1252 }],
1253 ['use_nss==1', { 1244 ['use_nss==1', {
1254 'defines': ['USE_NSS=1'], 1245 'defines': ['USE_NSS=1'],
1255 }], 1246 }],
1256 ['enable_one_click_signin==1', { 1247 ['enable_one_click_signin==1', {
1257 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 1248 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
1258 }], 1249 }],
1259 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1250 ['toolkit_uses_gtk==1 and toolkit_views==0', {
1260 # TODO(erg): We are progressively sealing up use of deprecated features 1251 # TODO(erg): We are progressively sealing up use of deprecated features
1261 # in gtk in preparation for an eventual porting to gtk3. 1252 # in gtk in preparation for an eventual porting to gtk3.
1262 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 1253 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
3048 # 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
3049 # Xcode variables depend on it, including variables such as 3040 # Xcode variables depend on it, including variables such as
3050 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3041 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3051 # 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
3052 # 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
3053 # 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,
3054 # and therefore SYMROOT, needs to be set at the project level. 3045 # and therefore SYMROOT, needs to be set at the project level.
3055 'SYMROOT': '<(DEPTH)/xcodebuild', 3046 'SYMROOT': '<(DEPTH)/xcodebuild',
3056 }, 3047 },
3057 } 3048 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698