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

Side by Side Diff: build/common.gypi

Issue 8905007: Put irt and untrusted TC dependencies behind a flag. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 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 | chrome/chrome_tests.gypi » ('j') | ppapi/native_client/native_client.gyp » ('J')
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 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 616
617 # The Java Bridge is not compiled in by default. 617 # The Java Bridge is not compiled in by default.
618 'java_bridge%': 0, 618 'java_bridge%': 0,
619 619
620 # TODO(dpranke): This determines whether we should attempt to build DRT 620 # TODO(dpranke): This determines whether we should attempt to build DRT
621 # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This 621 # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This
622 # flag should only be needed temporarily. See 622 # flag should only be needed temporarily. See
623 # https://bugs.webkit.org/show_bug.cgi?id=68463. 623 # https://bugs.webkit.org/show_bug.cgi?id=68463.
624 'build_webkit_exes_from_webkit_gyp%': 1, 624 'build_webkit_exes_from_webkit_gyp%': 1,
625 625
626 # This flag is only used when disable_nacl==0 and disables all those
627 # subcomponents which would require the installation of a native_client
628 # untrusted toolchain.
629 'disable_nacl_untrusted%': 0,
630
626 'conditions': [ 631 'conditions': [
627 # Used to disable Native Client at compile time, for platforms where it 632 # Used to disable Native Client at compile time, for platforms where it
628 # isn't supported (ARM) 633 # isn't supported (ARM)
629 ['target_arch=="arm"', { 634 ['target_arch=="arm" and chromeos == 1', {
630 'disable_nacl%': 1, 635 'disable_nacl%': 1,
631 }, { 636 }, {
632 'disable_nacl%': 0, 637 'disable_nacl%': 0,
633 }], 638 }],
634 ['os_posix==1 and OS!="mac" and OS!="android"', { 639 ['os_posix==1 and OS!="mac" and OS!="android"', {
635 # This will set gcc_version to XY if you are running gcc X.Y.*. 640 # This will set gcc_version to XY if you are running gcc X.Y.*.
636 # This is used to tweak build flags for gcc 4.4. 641 # This is used to tweak build flags for gcc 4.4.
637 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 642 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
638 # Figure out the python architecture to decide if we build pyauto. 643 # Figure out the python architecture to decide if we build pyauto.
639 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 644 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)',
(...skipping 2026 matching lines...) Expand 10 before | Expand all | Expand 10 after
2666 # settings in target dicts. SYMROOT is a special case, because many other 2671 # settings in target dicts. SYMROOT is a special case, because many other
2667 # Xcode variables depend on it, including variables such as 2672 # Xcode variables depend on it, including variables such as
2668 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2673 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2669 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2674 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2670 # files to appear (when present) in the UI as actual files and not red 2675 # files to appear (when present) in the UI as actual files and not red
2671 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2676 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2672 # and therefore SYMROOT, needs to be set at the project level. 2677 # and therefore SYMROOT, needs to be set at the project level.
2673 'SYMROOT': '<(DEPTH)/xcodebuild', 2678 'SYMROOT': '<(DEPTH)/xcodebuild',
2674 }, 2679 },
2675 } 2680 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | ppapi/native_client/native_client.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698