| OLD | NEW |
| 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 2454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2465 'cflags_cc+': [ | 2465 'cflags_cc+': [ |
| 2466 '-frtti', | 2466 '-frtti', |
| 2467 '-gline-tables-only', | 2467 '-gline-tables-only', |
| 2468 '-fintercept-allocation-functions', | 2468 '-fintercept-allocation-functions', |
| 2469 ], | 2469 ], |
| 2470 'defines': ['TYPE_PROFILING'], | 2470 'defines': ['TYPE_PROFILING'], |
| 2471 'dependencies': [ | 2471 'dependencies': [ |
| 2472 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', | 2472 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', |
| 2473 ], | 2473 ], |
| 2474 }], | 2474 }], |
| 2475 ['OS=="linux" and clang==1 and host_arch=="ia32"', { | |
| 2476 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed. | |
| 2477 # See http://crbug.com/162818. | |
| 2478 'cflags+': ['-Wno-sentinel'], | |
| 2479 }], | |
| 2480 ['branding=="Chrome"', { | 2475 ['branding=="Chrome"', { |
| 2481 'defines': ['GOOGLE_CHROME_BUILD'], | 2476 'defines': ['GOOGLE_CHROME_BUILD'], |
| 2482 }, { # else: branding!="Chrome" | 2477 }, { # else: branding!="Chrome" |
| 2483 'defines': ['CHROMIUM_BUILD'], | 2478 'defines': ['CHROMIUM_BUILD'], |
| 2484 }], | 2479 }], |
| 2485 ['OS=="mac" and component=="shared_library"', { | 2480 ['OS=="mac" and component=="shared_library"', { |
| 2486 'xcode_settings': { | 2481 'xcode_settings': { |
| 2487 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 2482 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 2488 'LD_RUNPATH_SEARCH_PATHS': [ | 2483 'LD_RUNPATH_SEARCH_PATHS': [ |
| 2489 # For unbundled binaries. | 2484 # For unbundled binaries. |
| (...skipping 3160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5650 # settings in target dicts. SYMROOT is a special case, because many other | 5645 # settings in target dicts. SYMROOT is a special case, because many other |
| 5651 # Xcode variables depend on it, including variables such as | 5646 # Xcode variables depend on it, including variables such as |
| 5652 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5647 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5653 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5648 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5654 # files to appear (when present) in the UI as actual files and not red | 5649 # files to appear (when present) in the UI as actual files and not red |
| 5655 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5650 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5656 # and therefore SYMROOT, needs to be set at the project level. | 5651 # and therefore SYMROOT, needs to be set at the project level. |
| 5657 'SYMROOT': '<(DEPTH)/xcodebuild', | 5652 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5658 }, | 5653 }, |
| 5659 } | 5654 } |
| OLD | NEW |