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

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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 # still built when this is unset, but builds using the normal chromium 140 # still built when this is unset, but builds using the normal chromium
141 # build system. 141 # build system.
142 'android_webview_build%': 0, 142 'android_webview_build%': 0,
143 143
144 # Sets whether chrome is built for google tv device. 144 # Sets whether chrome is built for google tv device.
145 'google_tv%': 0, 145 'google_tv%': 0,
146 146
147 # Set ARM architecture version. 147 # Set ARM architecture version.
148 'arm_version%': 7, 148 'arm_version%': 7,
149 149
150 # Use aurax11 for clipboard implementation. This is true on linux_aura.
151 'use_clipboard_aurax11%': 0,
152
150 # goma settings. 153 # goma settings.
151 # 1 to use goma. 154 # 1 to use goma.
152 # If no gomadir is set, it uses the default gomadir. 155 # If no gomadir is set, it uses the default gomadir.
153 'use_goma%': 0, 156 'use_goma%': 0,
154 'gomadir%': '', 157 'gomadir%': '',
155 158
156 'conditions': [ 159 'conditions': [
157 # Ash needs Aura. 160 # Ash needs Aura.
158 ['use_aura==0', { 161 ['use_aura==0', {
159 'use_ash%': 0, 162 'use_ash%': 0,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 'host_arch%': '<(host_arch)', 232 'host_arch%': '<(host_arch)',
230 'target_arch%': '<(target_arch)', 233 'target_arch%': '<(target_arch)',
231 'toolkit_views%': '<(toolkit_views)', 234 'toolkit_views%': '<(toolkit_views)',
232 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 235 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
233 'desktop_linux%': '<(desktop_linux)', 236 'desktop_linux%': '<(desktop_linux)',
234 'use_aura%': '<(use_aura)', 237 'use_aura%': '<(use_aura)',
235 'use_ash%': '<(use_ash)', 238 'use_ash%': '<(use_ash)',
236 'use_cras%': '<(use_cras)', 239 'use_cras%': '<(use_cras)',
237 'use_ozone%': '<(use_ozone)', 240 'use_ozone%': '<(use_ozone)',
238 'use_ozone_evdev%': '<(use_ozone_evdev)', 241 'use_ozone_evdev%': '<(use_ozone_evdev)',
242 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
239 'embedded%': '<(embedded)', 243 'embedded%': '<(embedded)',
240 'use_openssl%': '<(use_openssl)', 244 'use_openssl%': '<(use_openssl)',
241 'enable_viewport%': '<(enable_viewport)', 245 'enable_viewport%': '<(enable_viewport)',
242 'enable_hidpi%': '<(enable_hidpi)', 246 'enable_hidpi%': '<(enable_hidpi)',
243 'enable_touch_ui%': '<(enable_touch_ui)', 247 'enable_touch_ui%': '<(enable_touch_ui)',
244 'android_webview_build%': '<(android_webview_build)', 248 'android_webview_build%': '<(android_webview_build)',
245 'google_tv%': '<(google_tv)', 249 'google_tv%': '<(google_tv)',
246 'use_goma%': '<(use_goma)', 250 'use_goma%': '<(use_goma)',
247 'gomadir%': '<(gomadir)', 251 'gomadir%': '<(gomadir)',
248 'enable_app_list%': '<(enable_app_list)', 252 'enable_app_list%': '<(enable_app_list)',
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 'use_udev%': 0, 545 'use_udev%': 0,
542 }], 546 }],
543 547
544 # Flags to use X11 on non-Mac POSIX platforms. 548 # 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', { 549 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or use_ozone==1', {
546 'use_x11%': 0, 550 'use_x11%': 0,
547 }, { 551 }, {
548 'use_x11%': 1, 552 'use_x11%': 1,
549 }], 553 }],
550 554
555 ['OS=="linux" and use_aura==1 and chromeos==0', {
556 'use_clipboard_aurax11%': 1,
557 }],
558
551 # Flags to use glib. 559 # Flags to use glib.
552 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 560 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
553 'use_glib%': 0, 561 'use_glib%': 0,
554 }, { 562 }, {
555 'use_glib%': 1, 563 'use_glib%': 1,
556 }], 564 }],
557 565
558 # Flags to use pango and cairo. 566 # Flags to use pango and cairo.
559 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', { 567 ['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or embedded==1', {
560 'use_pango%': 0, 568 'use_pango%': 0,
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 'use_nss%': '<(use_nss)', 889 'use_nss%': '<(use_nss)',
882 'use_udev%': '<(use_udev)', 890 'use_udev%': '<(use_udev)',
883 'os_bsd%': '<(os_bsd)', 891 'os_bsd%': '<(os_bsd)',
884 'os_posix%': '<(os_posix)', 892 'os_posix%': '<(os_posix)',
885 'use_dbus%': '<(use_dbus)', 893 'use_dbus%': '<(use_dbus)',
886 'use_glib%': '<(use_glib)', 894 'use_glib%': '<(use_glib)',
887 'use_pango%': '<(use_pango)', 895 'use_pango%': '<(use_pango)',
888 'use_cairo%': '<(use_cairo)', 896 'use_cairo%': '<(use_cairo)',
889 'use_ozone%': '<(use_ozone)', 897 'use_ozone%': '<(use_ozone)',
890 'use_ozone_evdev%': '<(use_ozone_evdev)', 898 'use_ozone_evdev%': '<(use_ozone_evdev)',
899 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
891 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 900 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
892 'desktop_linux%': '<(desktop_linux)', 901 'desktop_linux%': '<(desktop_linux)',
893 'use_x11%': '<(use_x11)', 902 'use_x11%': '<(use_x11)',
894 'use_gnome_keyring%': '<(use_gnome_keyring)', 903 'use_gnome_keyring%': '<(use_gnome_keyring)',
895 'linux_fpic%': '<(linux_fpic)', 904 'linux_fpic%': '<(linux_fpic)',
896 'chromeos%': '<(chromeos)', 905 'chromeos%': '<(chromeos)',
897 'enable_viewport%': '<(enable_viewport)', 906 'enable_viewport%': '<(enable_viewport)',
898 'enable_hidpi%': '<(enable_hidpi)', 907 'enable_hidpi%': '<(enable_hidpi)',
899 'enable_touch_ui%': '<(enable_touch_ui)', 908 'enable_touch_ui%': '<(enable_touch_ui)',
900 'use_xi2_mt%':'<(use_xi2_mt)', 909 'use_xi2_mt%':'<(use_xi2_mt)',
(...skipping 1222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2123 }], 2132 }],
2124 ['use_libjpeg_turbo==1', { 2133 ['use_libjpeg_turbo==1', {
2125 'defines': ['USE_LIBJPEG_TURBO=1'], 2134 'defines': ['USE_LIBJPEG_TURBO=1'],
2126 }], 2135 }],
2127 ['use_nss==1', { 2136 ['use_nss==1', {
2128 'defines': ['USE_NSS=1'], 2137 'defines': ['USE_NSS=1'],
2129 }], 2138 }],
2130 ['use_x11==1', { 2139 ['use_x11==1', {
2131 'defines': ['USE_X11=1'], 2140 'defines': ['USE_X11=1'],
2132 }], 2141 }],
2142 ['use_clipboard_aurax11==1', {
2143 'defines': ['USE_CLIPBOARD_AURAX11=1'],
2144 }],
2133 ['enable_one_click_signin==1', { 2145 ['enable_one_click_signin==1', {
2134 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 2146 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
2135 }], 2147 }],
2136 ['toolkit_uses_gtk==1 and toolkit_views==0', { 2148 ['toolkit_uses_gtk==1 and toolkit_views==0', {
2137 # TODO(erg): We are progressively sealing up use of deprecated features 2149 # TODO(erg): We are progressively sealing up use of deprecated features
2138 # in gtk in preparation for an eventual porting to gtk3. 2150 # in gtk in preparation for an eventual porting to gtk3.
2139 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 2151 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
2140 }], 2152 }],
2141 ['chromeos==1', { 2153 ['chromeos==1', {
2142 'defines': ['OS_CHROMEOS=1'], 2154 'defines': ['OS_CHROMEOS=1'],
(...skipping 2661 matching lines...) Expand 10 before | Expand all | Expand 10 after
4804 # settings in target dicts. SYMROOT is a special case, because many other 4816 # settings in target dicts. SYMROOT is a special case, because many other
4805 # Xcode variables depend on it, including variables such as 4817 # Xcode variables depend on it, including variables such as
4806 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4818 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4807 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4819 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4808 # files to appear (when present) in the UI as actual files and not red 4820 # files to appear (when present) in the UI as actual files and not red
4809 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4821 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4810 # and therefore SYMROOT, needs to be set at the project level. 4822 # and therefore SYMROOT, needs to be set at the project level.
4811 'SYMROOT': '<(DEPTH)/xcodebuild', 4823 'SYMROOT': '<(DEPTH)/xcodebuild',
4812 }, 4824 },
4813 } 4825 }
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