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

Side by Side Diff: build/common.gypi

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed review issue Created 9 years, 3 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 | « build/build_config.h ('k') | views/accelerator.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 'use_x11%': 0, 230 'use_x11%': 0,
231 }, { 231 }, {
232 # TODO(dnicoara) Wayland build should have these disabled, but 232 # TODO(dnicoara) Wayland build should have these disabled, but
233 # currently GTK and X is too spread and it's hard to completely 233 # currently GTK and X is too spread and it's hard to completely
234 # remove every dependency. 234 # remove every dependency.
235 'use_glib%': 1, 235 'use_glib%': 1,
236 'toolkit_uses_gtk%': 1, 236 'toolkit_uses_gtk%': 1,
237 'use_x11%': 1, 237 'use_x11%': 1,
238 }], 238 }],
239 ['use_aura==1 and OS!="win"', { 239 ['use_aura==1 and OS!="win"', {
240 'toolkit_uses_gtk%': 1, 240 'toolkit_uses_gtk%': 0,
241 }], 241 }],
242 242
243 # A flag to enable or disable our compile-time dependency 243 # A flag to enable or disable our compile-time dependency
244 # on gnome-keyring. If that dependency is disabled, no gnome-keyring 244 # on gnome-keyring. If that dependency is disabled, no gnome-keyring
245 # support will be available. This option is useful 245 # support will be available. This option is useful
246 # for Linux distributions. 246 # for Linux distributions.
247 ['chromeos==1', { 247 ['chromeos==1', {
248 'use_gnome_keyring%': 0, 248 'use_gnome_keyring%': 0,
249 }, { 249 }, {
250 'use_gnome_keyring%': 1, 250 'use_gnome_keyring%': 1,
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 }], 849 }],
850 ['use_only_pure_views==1', { 850 ['use_only_pure_views==1', {
851 'defines': ['USE_ONLY_PURE_VIEWS=1'], 851 'defines': ['USE_ONLY_PURE_VIEWS=1'],
852 }], 852 }],
853 ['views_compositor==1', { 853 ['views_compositor==1', {
854 'defines': ['VIEWS_COMPOSITOR=1'], 854 'defines': ['VIEWS_COMPOSITOR=1'],
855 }], 855 }],
856 ['use_aura==1', { 856 ['use_aura==1', {
857 'defines': ['USE_AURA=1'], 857 'defines': ['USE_AURA=1'],
858 }], 858 }],
859 ['toolkit_uses_gtk==1', {
860 'defines': ['TOOLKIT_USES_GTK=1'],
861 }],
859 ['chromeos==1', { 862 ['chromeos==1', {
860 'defines': ['OS_CHROMEOS=1'], 863 'defines': ['OS_CHROMEOS=1'],
861 }], 864 }],
862 ['touchui==1', { 865 ['touchui==1', {
863 'defines': ['TOUCH_UI=1'], 866 'defines': ['TOUCH_UI=1'],
864 }], 867 }],
865 ['use_wayland==1', { 868 ['use_wayland==1', {
866 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], 869 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
867 }], 870 }],
868 ['file_manager_extension==1', { 871 ['file_manager_extension==1', {
(...skipping 1536 matching lines...) Expand 10 before | Expand all | Expand 10 after
2405 # settings in target dicts. SYMROOT is a special case, because many other 2408 # settings in target dicts. SYMROOT is a special case, because many other
2406 # Xcode variables depend on it, including variables such as 2409 # Xcode variables depend on it, including variables such as
2407 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2410 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2408 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2411 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2409 # files to appear (when present) in the UI as actual files and not red 2412 # files to appear (when present) in the UI as actual files and not red
2410 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2413 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2411 # and therefore SYMROOT, needs to be set at the project level. 2414 # and therefore SYMROOT, needs to be set at the project level.
2412 'SYMROOT': '<(DEPTH)/xcodebuild', 2415 'SYMROOT': '<(DEPTH)/xcodebuild',
2413 }, 2416 },
2414 } 2417 }
OLDNEW
« no previous file with comments | « build/build_config.h ('k') | views/accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698