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

Side by Side Diff: build/common.gypi

Issue 10537124: Fix build with disabled NaCl glibc toolchain. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 | ppapi/ppapi_untrusted.gyp » ('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 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 'NACL_WIN64', 1011 'NACL_WIN64',
1012 ], 1012 ],
1013 }], 1013 }],
1014 1014
1015 ['os_posix==1 and chromeos==0 and OS!="android"', { 1015 ['os_posix==1 and chromeos==0 and OS!="android"', {
1016 'use_cups%': 1, 1016 'use_cups%': 1,
1017 }, { 1017 }, {
1018 'use_cups%': 0, 1018 'use_cups%': 0,
1019 }], 1019 }],
1020 1020
1021 # Native Client glibc toolchain is enabled by default except on arm.
1022 ['target_arch=="arm"', {
1023 'disable_glibc%': 1,
1024 }, {
1025 'disable_glibc%': 0,
1026 }],
1027
1021 # Set the relative path from this file to the GYP file of the JPEG 1028 # Set the relative path from this file to the GYP file of the JPEG
1022 # library used by Chromium. 1029 # library used by Chromium.
1023 ['use_libjpeg_turbo==1', { 1030 ['use_libjpeg_turbo==1', {
1024 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', 1031 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
1025 }, { 1032 }, {
1026 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp', 1033 'libjpeg_gyp_path': '../third_party/libjpeg/libjpeg.gyp',
1027 }], # use_libjpeg_turbo==1 1034 }], # use_libjpeg_turbo==1
1028 1035
1029 # Options controlling the use of GConf (the classic GNOME configuration 1036 # Options controlling the use of GConf (the classic GNOME configuration
1030 # system) and GIO, which contains GSettings (the new GNOME config system). 1037 # system) and GIO, which contains GSettings (the new GNOME config system).
(...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after
3134 # settings in target dicts. SYMROOT is a special case, because many other 3141 # settings in target dicts. SYMROOT is a special case, because many other
3135 # Xcode variables depend on it, including variables such as 3142 # Xcode variables depend on it, including variables such as
3136 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3143 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3137 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3144 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3138 # files to appear (when present) in the UI as actual files and not red 3145 # files to appear (when present) in the UI as actual files and not red
3139 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3146 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3140 # and therefore SYMROOT, needs to be set at the project level. 3147 # and therefore SYMROOT, needs to be set at the project level.
3141 'SYMROOT': '<(DEPTH)/xcodebuild', 3148 'SYMROOT': '<(DEPTH)/xcodebuild',
3142 }, 3149 },
3143 } 3150 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698