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

Side by Side Diff: build/common.gypi

Issue 9911013: Remove hack in .gyp file disabling NaCl in ARM CrOs build. We still have it disabled in ebuild. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 | « no previous file | no next file » | 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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 # subcomponents which would require the installation of a native_client 717 # subcomponents which would require the installation of a native_client
718 # untrusted toolchain. 718 # untrusted toolchain.
719 'disable_nacl_untrusted%': 0, 719 'disable_nacl_untrusted%': 0,
720 720
721 # Disable Dart by default. 721 # Disable Dart by default.
722 'enable_dart%': 0, 722 'enable_dart%': 0,
723 723
724 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi. 724 # The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
725 'msbuild_toolset%': '', 725 'msbuild_toolset%': '',
726 726
727 # Native Client is enabled by default.
728 'disable_nacl%': 0,
729
727 'conditions': [ 730 'conditions': [
728 # Used to disable Native Client at compile time, for platforms where it
729 # isn't supported (ARM)
730 ['target_arch=="arm" and chromeos == 1', {
731 'disable_nacl%': 1,
732 }, {
733 'disable_nacl%': 0,
734 }],
735 ['os_posix==1 and OS!="mac" and OS!="android"', { 731 ['os_posix==1 and OS!="mac" and OS!="android"', {
736 # This will set gcc_version to XY if you are running gcc X.Y.*. 732 # This will set gcc_version to XY if you are running gcc X.Y.*.
737 # This is used to tweak build flags for gcc 4.4. 733 # This is used to tweak build flags for gcc 4.4.
738 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 734 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
739 # Figure out the python architecture to decide if we build pyauto. 735 # Figure out the python architecture to decide if we build pyauto.
740 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 736 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)',
741 'conditions': [ 737 'conditions': [
742 ['branding=="Chrome"', { 738 ['branding=="Chrome"', {
743 'linux_breakpad%': 1, 739 'linux_breakpad%': 1,
744 }], 740 }],
(...skipping 2203 matching lines...) Expand 10 before | Expand all | Expand 10 after
2948 # settings in target dicts. SYMROOT is a special case, because many other 2944 # settings in target dicts. SYMROOT is a special case, because many other
2949 # Xcode variables depend on it, including variables such as 2945 # Xcode variables depend on it, including variables such as
2950 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2946 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2951 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2947 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2952 # files to appear (when present) in the UI as actual files and not red 2948 # files to appear (when present) in the UI as actual files and not red
2953 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2949 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2954 # and therefore SYMROOT, needs to be set at the project level. 2950 # and therefore SYMROOT, needs to be set at the project level.
2955 'SYMROOT': '<(DEPTH)/xcodebuild', 2951 'SYMROOT': '<(DEPTH)/xcodebuild',
2956 }, 2952 },
2957 } 2953 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698