| 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 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2421 'cflags_cc+': [ | 2421 'cflags_cc+': [ |
| 2422 '-frtti', | 2422 '-frtti', |
| 2423 '-gline-tables-only', | 2423 '-gline-tables-only', |
| 2424 '-fintercept-allocation-functions', | 2424 '-fintercept-allocation-functions', |
| 2425 ], | 2425 ], |
| 2426 'defines': ['TYPE_PROFILING'], | 2426 'defines': ['TYPE_PROFILING'], |
| 2427 'dependencies': [ | 2427 'dependencies': [ |
| 2428 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', | 2428 '<(DEPTH)/base/allocator/allocator.gyp:type_profiler', |
| 2429 ], | 2429 ], |
| 2430 }], | 2430 }], |
| 2431 ['OS=="linux" and clang==1 and host_arch=="ia32"', { | |
| 2432 # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed. | |
| 2433 # See http://crbug.com/162818. | |
| 2434 'cflags+': ['-Wno-sentinel'], | |
| 2435 }], | |
| 2436 ['branding=="Chrome"', { | 2431 ['branding=="Chrome"', { |
| 2437 'defines': ['GOOGLE_CHROME_BUILD'], | 2432 'defines': ['GOOGLE_CHROME_BUILD'], |
| 2438 }, { # else: branding!="Chrome" | 2433 }, { # else: branding!="Chrome" |
| 2439 'defines': ['CHROMIUM_BUILD'], | 2434 'defines': ['CHROMIUM_BUILD'], |
| 2440 }], | 2435 }], |
| 2441 ['OS=="mac" and component=="shared_library"', { | 2436 ['OS=="mac" and component=="shared_library"', { |
| 2442 'xcode_settings': { | 2437 'xcode_settings': { |
| 2443 'DYLIB_INSTALL_NAME_BASE': '@rpath', | 2438 'DYLIB_INSTALL_NAME_BASE': '@rpath', |
| 2444 'LD_RUNPATH_SEARCH_PATHS': [ | 2439 'LD_RUNPATH_SEARCH_PATHS': [ |
| 2445 # For unbundled binaries. | 2440 # For unbundled binaries. |
| (...skipping 3226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5672 # settings in target dicts. SYMROOT is a special case, because many other | 5667 # settings in target dicts. SYMROOT is a special case, because many other |
| 5673 # Xcode variables depend on it, including variables such as | 5668 # Xcode variables depend on it, including variables such as |
| 5674 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5669 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5675 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5670 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5676 # files to appear (when present) in the UI as actual files and not red | 5671 # files to appear (when present) in the UI as actual files and not red |
| 5677 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5672 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5678 # and therefore SYMROOT, needs to be set at the project level. | 5673 # and therefore SYMROOT, needs to be set at the project level. |
| 5679 'SYMROOT': '<(DEPTH)/xcodebuild', | 5674 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5680 }, | 5675 }, |
| 5681 } | 5676 } |
| OLD | NEW |