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

Side by Side Diff: build/common.gypi

Issue 8710002: Disable build of NaCl in ChromeOS (Closed) Base URL: svn://chrome-svn/chrome/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 | 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) 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 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 614
615 # TODO(dpranke): This determines whether we should attempt to build DRT 615 # TODO(dpranke): This determines whether we should attempt to build DRT
616 # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This 616 # et al. from WebKit/Source/WebKit.gyp or Tools/Tools.gyp. This
617 # flag should only be needed temporarily. See 617 # flag should only be needed temporarily. See
618 # https://bugs.webkit.org/show_bug.cgi?id=68463. 618 # https://bugs.webkit.org/show_bug.cgi?id=68463.
619 'build_webkit_exes_from_webkit_gyp%': 1, 619 'build_webkit_exes_from_webkit_gyp%': 1,
620 620
621 'conditions': [ 621 'conditions': [
622 # Used to disable Native Client at compile time, for platforms where it 622 # Used to disable Native Client at compile time, for platforms where it
623 # isn't supported (ARM) 623 # isn't supported (ARM)
624 ['target_arch=="arm"', { 624 ['target_arch=="arm" or chromeos==1', {
625 'disable_nacl%': 1, 625 'disable_nacl%': 1,
626 }, { 626 }, {
627 'disable_nacl%': 0, 627 'disable_nacl%': 0,
628 }], 628 }],
629 ['os_posix==1 and OS!="mac" and OS!="android"', { 629 ['os_posix==1 and OS!="mac" and OS!="android"', {
630 # This will set gcc_version to XY if you are running gcc X.Y.*. 630 # This will set gcc_version to XY if you are running gcc X.Y.*.
631 # This is used to tweak build flags for gcc 4.4. 631 # This is used to tweak build flags for gcc 4.4.
632 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 632 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
633 # Figure out the python architecture to decide if we build pyauto. 633 # Figure out the python architecture to decide if we build pyauto.
634 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 634 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)',
(...skipping 2012 matching lines...) Expand 10 before | Expand all | Expand 10 after
2647 # settings in target dicts. SYMROOT is a special case, because many other 2647 # settings in target dicts. SYMROOT is a special case, because many other
2648 # Xcode variables depend on it, including variables such as 2648 # Xcode variables depend on it, including variables such as
2649 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2649 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2650 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2650 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2651 # files to appear (when present) in the UI as actual files and not red 2651 # files to appear (when present) in the UI as actual files and not red
2652 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2652 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2653 # and therefore SYMROOT, needs to be set at the project level. 2653 # and therefore SYMROOT, needs to be set at the project level.
2654 'SYMROOT': '<(DEPTH)/xcodebuild', 2654 'SYMROOT': '<(DEPTH)/xcodebuild',
2655 }, 2655 },
2656 } 2656 }
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