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

Side by Side Diff: build/common.gypi

Issue 9478015: Aura: Build on the linux desktop, plus add USE_ASH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try to minimize shell.h change Created 8 years, 9 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/all.gyp ('k') | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.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) 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 [ 'OS=="win" or OS=="mac"', { 64 [ 'OS=="win" or OS=="mac"', {
65 'host_arch%': 'ia32', 65 'host_arch%': 'ia32',
66 }, { 66 }, {
67 # This handles the Unix platforms for which there is some support. 67 # This handles the Unix platforms for which there is some support.
68 # Anything else gets passed through, which probably won't work very 68 # Anything else gets passed through, which probably won't work very
69 # well; such hosts should pass an explicit target_arch to gyp. 69 # well; such hosts should pass an explicit target_arch to gyp.
70 'host_arch%': 70 'host_arch%':
71 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 71 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
72 }], 72 }],
73 73
74 # Ash and ChromeOS require Aura. 74 # Non-GTK Chromeos implies ash.
75 ['(use_ash==1 or chromeos==1) and chromeos_gtk==0', { 75 ['chromeos==1', {
sadrul 2012/03/02 03:39:24 Should this have been 'chromeos==1 and chromeos_gt
Elliot Glaysher 2012/03/02 17:32:39 According to saintlou, that's redundant.
Peter Mayo 2012/03/04 16:17:56 We need that to support merges for R18 & earlier.
76 'use_ash%': 1,
76 'use_aura%': 1, 77 'use_aura%': 1,
77 }], 78 }],
78 79
80 # For now, Windows *AND* Linux builds that |use_aura| should also
81 # imply using ash. This rule should be removed for the future when
82 # both Linux and Windows are using the aura windows without the ash
83 # interface.
84 ['use_aura==1 and ((OS=="linux" and chromeos==0) or OS=="win")', {
85 'use_ash%': 1,
86 }],
87
79 # Set default value of toolkit_views based on OS. 88 # Set default value of toolkit_views based on OS.
80 ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', { 89 ['OS=="win" or chromeos==1 or chromeos_gtk==1 or use_aura==1', {
81 'toolkit_views%': 1, 90 'toolkit_views%': 1,
82 }, { 91 }, {
83 'toolkit_views%': 0, 92 'toolkit_views%': 0,
84 }], 93 }],
85 94
86 # ChromeOS GTK implies ChromeOS. 95 # ChromeOS GTK implies ChromeOS.
87 ['chromeos_gtk==1', { 96 ['chromeos_gtk==1', {
88 'chromeos%': 1, 97 'chromeos%': 1,
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 'use_titlecase_in_grd_files%': 1, 354 'use_titlecase_in_grd_files%': 1,
346 }], 355 }],
347 356
348 # Enable some hacks to support Flapper only on Chrome OS. 357 # Enable some hacks to support Flapper only on Chrome OS.
349 ['chromeos==1', { 358 ['chromeos==1', {
350 'enable_flapper_hacks%': 1, 359 'enable_flapper_hacks%': 1,
351 }, { 360 }, {
352 'enable_flapper_hacks%': 0, 361 'enable_flapper_hacks%': 0,
353 }], 362 }],
354 363
355 # Enable file manager extension on Chrome OS or Aura. 364 # Enable file manager extension on Chrome OS.
356 ['chromeos==1 or use_aura==1', { 365 ['chromeos==1', {
357 'file_manager_extension%': 1, 366 'file_manager_extension%': 1,
358 }, { 367 }, {
359 'file_manager_extension%': 0, 368 'file_manager_extension%': 0,
360 }], 369 }],
361 370
362 # ... except on Windows even with Aura.
363 ['use_aura==1 and OS=="win"', {
364 'file_manager_extension%': 0,
365 }],
366
367 ['OS=="android"', { 371 ['OS=="android"', {
368 'proprietary_codecs%': 1, 372 'proprietary_codecs%': 1,
369 'enable_webrtc%': 0, 373 'enable_webrtc%': 0,
370 }], 374 }],
371 375
372 # Use GPU accelerated cross process image transport by default 376 # Use GPU accelerated cross process image transport by default
373 # on linux builds with the Aura window manager 377 # on linux builds with the Aura window manager
374 ['use_aura==1 and OS=="linux"', { 378 ['use_aura==1 and OS=="linux"', {
375 'ui_compositor_image_transport%': 1, 379 'ui_compositor_image_transport%': 1,
376 }, { 380 }, {
(...skipping 2431 matching lines...) Expand 10 before | Expand all | Expand 10 after
2808 # settings in target dicts. SYMROOT is a special case, because many other 2812 # settings in target dicts. SYMROOT is a special case, because many other
2809 # Xcode variables depend on it, including variables such as 2813 # Xcode variables depend on it, including variables such as
2810 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2814 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2811 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2815 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2812 # files to appear (when present) in the UI as actual files and not red 2816 # files to appear (when present) in the UI as actual files and not red
2813 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2817 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2814 # and therefore SYMROOT, needs to be set at the project level. 2818 # and therefore SYMROOT, needs to be set at the project level.
2815 'SYMROOT': '<(DEPTH)/xcodebuild', 2819 'SYMROOT': '<(DEPTH)/xcodebuild',
2816 }, 2820 },
2817 } 2821 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698