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

Side by Side Diff: build/common.gypi

Issue 10389196: Adding base_untrusted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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
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 1217 matching lines...) Expand 10 before | Expand all | Expand 10 after
1228 'win_debug_extra_cflags%': '', 1228 'win_debug_extra_cflags%': '',
1229 1229
1230 # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600 1230 # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600
1231 'enable_wexit_time_destructors%': '<(enable_wexit_time_destructors)', 1231 'enable_wexit_time_destructors%': '<(enable_wexit_time_destructors)',
1232 1232
1233 # Only used by Windows build for now. Can be used to build into a 1233 # Only used by Windows build for now. Can be used to build into a
1234 # differet output directory, e.g., a build_dir_prefix of VS2010_ would 1234 # differet output directory, e.g., a build_dir_prefix of VS2010_ would
1235 # output files in src/build/VS2010_{Debug,Release}. 1235 # output files in src/build/VS2010_{Debug,Release}.
1236 'build_dir_prefix%': '', 1236 'build_dir_prefix%': '',
1237 1237
1238 # Targets are by default not nacl untrusted code.
1239 'nacl_untrusted_build%': 0,
1240
1238 'conditions': [ 1241 'conditions': [
1239 ['OS=="win" and component=="shared_library"', { 1242 ['OS=="win" and component=="shared_library"', {
1240 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx 1243 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
1241 'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL) 1244 'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL)
1242 'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL) 1245 'win_debug_RuntimeLibrary%': '3', # 3 = /MDd (debug DLL)
1243 }, { 1246 }, {
1244 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx 1247 # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
1245 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static) 1248 'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
1246 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static) 1249 'win_debug_RuntimeLibrary%': '1', # 1 = /MTd (debug static)
1247 }], 1250 }],
(...skipping 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after
3112 # settings in target dicts. SYMROOT is a special case, because many other 3115 # settings in target dicts. SYMROOT is a special case, because many other
3113 # Xcode variables depend on it, including variables such as 3116 # Xcode variables depend on it, including variables such as
3114 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3117 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3115 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3118 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3116 # files to appear (when present) in the UI as actual files and not red 3119 # files to appear (when present) in the UI as actual files and not red
3117 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3120 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3118 # and therefore SYMROOT, needs to be set at the project level. 3121 # and therefore SYMROOT, needs to be set at the project level.
3119 'SYMROOT': '<(DEPTH)/xcodebuild', 3122 'SYMROOT': '<(DEPTH)/xcodebuild',
3120 }, 3123 },
3121 } 3124 }
OLDNEW
« base/base.gypi ('K') | « build/all.gyp ('k') | build/filename_rules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698