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

Side by Side Diff: build/common.gypi

Issue 113763003: Add use_clibpard_aurax11 gyp flag to allow chromeos-chrome to access X11 Clipboard (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | ui/base/clipboard/clipboard.h » ('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 17 matching lines...) Expand all
28 'use_ash%': 0, 28 'use_ash%': 0,
29 29
30 # Whether or not we are using CRAS, the ChromeOS Audio Server. 30 # Whether or not we are using CRAS, the ChromeOS Audio Server.
31 'use_cras%': 0, 31 'use_cras%': 0,
32 32
33 # Use a raw surface abstraction. 33 # Use a raw surface abstraction.
34 'use_ozone%': 0, 34 'use_ozone%': 0,
35 35
36 # Configure the build for small devices. See crbug.com/318413 36 # Configure the build for small devices. See crbug.com/318413
37 'embedded%': 0, 37 'embedded%': 0,
38
39 # Use aurax11 for clipboard implementation. This is true on linux_au ra.
40 'use_clipboard_aurax11%': 0,
tony 2013/12/12 17:38:20 You don't need to define this at the deepest nesti
38 }, 41 },
39 # Copy conditionally-set variables out one scope. 42 # Copy conditionally-set variables out one scope.
40 'chromeos%': '<(chromeos)', 43 'chromeos%': '<(chromeos)',
41 'use_aura%': '<(use_aura)', 44 'use_aura%': '<(use_aura)',
42 'use_ash%': '<(use_ash)', 45 'use_ash%': '<(use_ash)',
43 'use_cras%': '<(use_cras)', 46 'use_cras%': '<(use_cras)',
44 'use_ozone%': '<(use_ozone)', 47 'use_ozone%': '<(use_ozone)',
45 'embedded%': '<(embedded)', 48 'embedded%': '<(embedded)',
49 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
46 50
47 # Whether we are using Views Toolkit 51 # Whether we are using Views Toolkit
48 'toolkit_views%': 0, 52 'toolkit_views%': 0,
49 53
50 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 54 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
51 'use_openssl%': 0, 55 'use_openssl%': 0,
52 56
53 # Disable viewport meta tag by default. 57 # Disable viewport meta tag by default.
54 'enable_viewport%': 0, 58 'enable_viewport%': 0,
55 59
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 }], 119 }],
116 ], 120 ],
117 }, 121 },
118 # Copy conditionally-set variables out one scope. 122 # Copy conditionally-set variables out one scope.
119 'chromeos%': '<(chromeos)', 123 'chromeos%': '<(chromeos)',
120 'desktop_linux%': '<(desktop_linux)', 124 'desktop_linux%': '<(desktop_linux)',
121 'use_aura%': '<(use_aura)', 125 'use_aura%': '<(use_aura)',
122 'use_ash%': '<(use_ash)', 126 'use_ash%': '<(use_ash)',
123 'use_cras%': '<(use_cras)', 127 'use_cras%': '<(use_cras)',
124 'use_ozone%': '<(use_ozone)', 128 'use_ozone%': '<(use_ozone)',
129 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
tony 2013/12/12 17:38:20 I think this is the first depth you need to define
125 'embedded%': '<(embedded)', 130 'embedded%': '<(embedded)',
126 'use_openssl%': '<(use_openssl)', 131 'use_openssl%': '<(use_openssl)',
127 'enable_viewport%': '<(enable_viewport)', 132 'enable_viewport%': '<(enable_viewport)',
128 'enable_hidpi%': '<(enable_hidpi)', 133 'enable_hidpi%': '<(enable_hidpi)',
129 'enable_touch_ui%': '<(enable_touch_ui)', 134 'enable_touch_ui%': '<(enable_touch_ui)',
130 'buildtype%': '<(buildtype)', 135 'buildtype%': '<(buildtype)',
131 'branding%': '<(branding)', 136 'branding%': '<(branding)',
132 'host_arch%': '<(host_arch)', 137 'host_arch%': '<(host_arch)',
133 138
134 # Default architecture we're building for is the architecture we're 139 # Default architecture we're building for is the architecture we're
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 'host_arch%': '<(host_arch)', 234 'host_arch%': '<(host_arch)',
230 'target_arch%': '<(target_arch)', 235 'target_arch%': '<(target_arch)',
231 'toolkit_views%': '<(toolkit_views)', 236 'toolkit_views%': '<(toolkit_views)',
232 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 237 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
233 'desktop_linux%': '<(desktop_linux)', 238 'desktop_linux%': '<(desktop_linux)',
234 'use_aura%': '<(use_aura)', 239 'use_aura%': '<(use_aura)',
235 'use_ash%': '<(use_ash)', 240 'use_ash%': '<(use_ash)',
236 'use_cras%': '<(use_cras)', 241 'use_cras%': '<(use_cras)',
237 'use_ozone%': '<(use_ozone)', 242 'use_ozone%': '<(use_ozone)',
238 'use_ozone_evdev%': '<(use_ozone_evdev)', 243 'use_ozone_evdev%': '<(use_ozone_evdev)',
244 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
239 'embedded%': '<(embedded)', 245 'embedded%': '<(embedded)',
240 'use_openssl%': '<(use_openssl)', 246 'use_openssl%': '<(use_openssl)',
241 'enable_viewport%': '<(enable_viewport)', 247 'enable_viewport%': '<(enable_viewport)',
242 'enable_hidpi%': '<(enable_hidpi)', 248 'enable_hidpi%': '<(enable_hidpi)',
243 'enable_touch_ui%': '<(enable_touch_ui)', 249 'enable_touch_ui%': '<(enable_touch_ui)',
244 'android_webview_build%': '<(android_webview_build)', 250 'android_webview_build%': '<(android_webview_build)',
245 'google_tv%': '<(google_tv)', 251 'google_tv%': '<(google_tv)',
246 'use_goma%': '<(use_goma)', 252 'use_goma%': '<(use_goma)',
247 'gomadir%': '<(gomadir)', 253 'gomadir%': '<(gomadir)',
248 'enable_app_list%': '<(enable_app_list)', 254 'enable_app_list%': '<(enable_app_list)',
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'use_udev%': 0, 547 'use_udev%': 0,
542 }], 548 }],
543 549
544 # Flags to use X11 on non-Mac POSIX platforms. 550 # Flags to use X11 on non-Mac POSIX platforms.
545 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', { 551 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
546 'use_x11%': 0, 552 'use_x11%': 0,
547 }, { 553 }, {
548 'use_x11%': 1, 554 'use_x11%': 1,
549 }], 555 }],
550 556
557 ['OS=="linux" and use_aura==1 and chromeos==0', {
558 'use_clipboard_aurax11%': 1,
559 }],
560
551 # Flags to use glib. 561 # Flags to use glib.
552 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 562 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
553 'use_glib%': 0, 563 'use_glib%': 0,
554 }, { 564 }, {
555 'use_glib%': 1, 565 'use_glib%': 1,
556 }], 566 }],
557 567
558 # Flags to use pango and cairo. 568 # Flags to use pango and cairo.
559 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 569 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
560 'use_pango%': 0, 570 'use_pango%': 0,
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 'use_nss%': '<(use_nss)', 891 'use_nss%': '<(use_nss)',
882 'use_udev%': '<(use_udev)', 892 'use_udev%': '<(use_udev)',
883 'os_bsd%': '<(os_bsd)', 893 'os_bsd%': '<(os_bsd)',
884 'os_posix%': '<(os_posix)', 894 'os_posix%': '<(os_posix)',
885 'use_dbus%': '<(use_dbus)', 895 'use_dbus%': '<(use_dbus)',
886 'use_glib%': '<(use_glib)', 896 'use_glib%': '<(use_glib)',
887 'use_pango%': '<(use_pango)', 897 'use_pango%': '<(use_pango)',
888 'use_cairo%': '<(use_cairo)', 898 'use_cairo%': '<(use_cairo)',
889 'use_ozone%': '<(use_ozone)', 899 'use_ozone%': '<(use_ozone)',
890 'use_ozone_evdev%': '<(use_ozone_evdev)', 900 'use_ozone_evdev%': '<(use_ozone_evdev)',
901 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
891 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 902 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
892 'desktop_linux%': '<(desktop_linux)', 903 'desktop_linux%': '<(desktop_linux)',
893 'use_x11%': '<(use_x11)', 904 'use_x11%': '<(use_x11)',
894 'use_gnome_keyring%': '<(use_gnome_keyring)', 905 'use_gnome_keyring%': '<(use_gnome_keyring)',
895 'linux_fpic%': '<(linux_fpic)', 906 'linux_fpic%': '<(linux_fpic)',
896 'chromeos%': '<(chromeos)', 907 'chromeos%': '<(chromeos)',
897 'enable_viewport%': '<(enable_viewport)', 908 'enable_viewport%': '<(enable_viewport)',
898 'enable_hidpi%': '<(enable_hidpi)', 909 'enable_hidpi%': '<(enable_hidpi)',
899 'enable_touch_ui%': '<(enable_touch_ui)', 910 'enable_touch_ui%': '<(enable_touch_ui)',
900 'use_xi2_mt%':'<(use_xi2_mt)', 911 'use_xi2_mt%':'<(use_xi2_mt)',
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 }], 2137 }],
2127 ['use_libjpeg_turbo==1', { 2138 ['use_libjpeg_turbo==1', {
2128 'defines': ['USE_LIBJPEG_TURBO=1'], 2139 'defines': ['USE_LIBJPEG_TURBO=1'],
2129 }], 2140 }],
2130 ['use_nss==1', { 2141 ['use_nss==1', {
2131 'defines': ['USE_NSS=1'], 2142 'defines': ['USE_NSS=1'],
2132 }], 2143 }],
2133 ['use_x11==1', { 2144 ['use_x11==1', {
2134 'defines': ['USE_X11=1'], 2145 'defines': ['USE_X11=1'],
2135 }], 2146 }],
2147 ['use_clipboard_aurax11==1', {
2148 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2149 }],
2136 ['enable_one_click_signin==1', { 2150 ['enable_one_click_signin==1', {
2137 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2151 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2138 }], 2152 }],
2139 ['toolkit_uses_gtk==1 and toolkit_views==0', { 2153 ['toolkit_uses_gtk==1 and toolkit_views==0', {
2140 # TODO(erg): We are progressively sealing up use of deprecated features 2154 # TODO(erg): We are progressively sealing up use of deprecated features
2141 # in gtk in preparation for an eventual porting to gtk3. 2155 # in gtk in preparation for an eventual porting to gtk3.
2142 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 2156 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
2143 }], 2157 }],
2144 ['chromeos==1', { 2158 ['chromeos==1', {
2145 'defines': ['OS_CHROMEOS=1'], 2159 'defines': ['OS_CHROMEOS=1'],
(...skipping 2661 matching lines...) Expand 10 before | Expand all | Expand 10 after
4807 # settings in target dicts. SYMROOT is a special case, because many other 4821 # settings in target dicts. SYMROOT is a special case, because many other
4808 # Xcode variables depend on it, including variables such as 4822 # Xcode variables depend on it, including variables such as
4809 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4823 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4810 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4824 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4811 # files to appear (when present) in the UI as actual files and not red 4825 # files to appear (when present) in the UI as actual files and not red
4812 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4826 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4813 # and therefore SYMROOT, needs to be set at the project level. 4827 # and therefore SYMROOT, needs to be set at the project level.
4814 'SYMROOT': '<(DEPTH)/xcodebuild', 4828 'SYMROOT': '<(DEPTH)/xcodebuild',
4815 }, 4829 },
4816 } 4830 }
OLDNEW
« no previous file with comments | « no previous file | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698