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

Side by Side Diff: build/common.gypi

Issue 8243012: Fix build with system yasm. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | « DEPS ('k') | third_party/yasm/yasm_compile.gypi » ('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) 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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 'p2p_apis%': '<(p2p_apis)', 376 'p2p_apis%': '<(p2p_apis)',
377 'configuration_policy%': '<(configuration_policy)', 377 'configuration_policy%': '<(configuration_policy)',
378 'safe_browsing%': '<(safe_browsing)', 378 'safe_browsing%': '<(safe_browsing)',
379 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 379 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)',
380 'asan%': '<(asan)', 380 'asan%': '<(asan)',
381 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 381 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
382 'enable_web_intents%': '<(enable_web_intents)', 382 'enable_web_intents%': '<(enable_web_intents)',
383 # Whether to build for Wayland display server 383 # Whether to build for Wayland display server
384 'use_wayland%': 0, 384 'use_wayland%': 0,
385 385
386 # Use system yasm instead of bundled one.
387 'use_system_yasm%': 0,
388
386 # Default to enabled PIE; this is important for ASLR but we need to be 389 # Default to enabled PIE; this is important for ASLR but we need to be
387 # able to turn it off for remote debugging on Chromium OS 390 # able to turn it off for remote debugging on Chromium OS
388 'linux_disable_pie%': 0, 391 'linux_disable_pie%': 0,
389 392
390 # The release channel that this build targets. This is used to restrict 393 # The release channel that this build targets. This is used to restrict
391 # channel-specific build options, like which installer packages to create. 394 # channel-specific build options, like which installer packages to create.
392 # The default is 'all', which does no channel-specific filtering. 395 # The default is 'all', which does no channel-specific filtering.
393 'channel%': 'all', 396 'channel%': 'all',
394 397
395 # Override chromium_mac_pch and set it to 0 to suppress the use of 398 # Override chromium_mac_pch and set it to 0 to suppress the use of
(...skipping 2136 matching lines...) Expand 10 before | Expand all | Expand 10 after
2532 # settings in target dicts. SYMROOT is a special case, because many other 2535 # settings in target dicts. SYMROOT is a special case, because many other
2533 # Xcode variables depend on it, including variables such as 2536 # Xcode variables depend on it, including variables such as
2534 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2537 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2535 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2538 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2536 # files to appear (when present) in the UI as actual files and not red 2539 # files to appear (when present) in the UI as actual files and not red
2537 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2540 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2538 # and therefore SYMROOT, needs to be set at the project level. 2541 # and therefore SYMROOT, needs to be set at the project level.
2539 'SYMROOT': '<(DEPTH)/xcodebuild', 2542 'SYMROOT': '<(DEPTH)/xcodebuild',
2540 }, 2543 },
2541 } 2544 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/yasm/yasm_compile.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698