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

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: Attempt to refix chromeos Created 8 years, 10 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 }], 345 }],
346 346
347 # Enable some hacks to support Flapper only on Chrome OS. 347 # Enable some hacks to support Flapper only on Chrome OS.
348 ['chromeos==1', { 348 ['chromeos==1', {
349 'enable_flapper_hacks%': 1, 349 'enable_flapper_hacks%': 1,
350 }, { 350 }, {
351 'enable_flapper_hacks%': 0, 351 'enable_flapper_hacks%': 0,
352 }], 352 }],
353 353
354 # Enable file manager extension on Chrome OS or Aura. 354 # Enable file manager extension on Chrome OS or Aura.
355 ['chromeos==1 or use_aura==1', { 355 ['chromeos==1 or use_aura==1', {
Ben Goodger (Google) 2012/02/28 20:12:06 change this to just be chromeos==1
Elliot Glaysher 2012/02/28 20:35:54 Done.
356 'file_manager_extension%': 1, 356 'file_manager_extension%': 1,
357 }, { 357 }, {
358 'file_manager_extension%': 0, 358 'file_manager_extension%': 0,
359 }], 359 }],
360 360
361 # ... except on Windows even with Aura. 361 # ... except on Windows/Native Linux even with Aura.
362 ['use_aura==1 and OS=="win"', { 362 ['use_aura==1 and (OS=="win" or (OS=="linux" and chromeos==0))', {
Ben Goodger (Google) 2012/02/28 20:12:06 and then discard this whole block.
363 'file_manager_extension%': 0, 363 'file_manager_extension%': 0,
364 }], 364 }],
365 365
366 ['OS=="android"', { 366 ['OS=="android"', {
367 'proprietary_codecs%': 1, 367 'proprietary_codecs%': 1,
368 'enable_webrtc%': 0, 368 'enable_webrtc%': 0,
369 }], 369 }],
370 370
371 # Use GPU accelerated cross process image transport by default 371 # Use GPU accelerated cross process image transport by default
372 # on linux builds with the Aura window manager 372 # on linux builds with the Aura window manager
(...skipping 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2796 # settings in target dicts. SYMROOT is a special case, because many other 2796 # settings in target dicts. SYMROOT is a special case, because many other
2797 # Xcode variables depend on it, including variables such as 2797 # Xcode variables depend on it, including variables such as
2798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2800 # files to appear (when present) in the UI as actual files and not red 2800 # files to appear (when present) in the UI as actual files and not red
2801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2802 # and therefore SYMROOT, needs to be set at the project level. 2802 # and therefore SYMROOT, needs to be set at the project level.
2803 'SYMROOT': '<(DEPTH)/xcodebuild', 2803 'SYMROOT': '<(DEPTH)/xcodebuild',
2804 }, 2804 },
2805 } 2805 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698