| 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 3598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3609 ['msan==1', { | 3609 ['msan==1', { |
| 3610 'target_conditions': [ | 3610 'target_conditions': [ |
| 3611 ['_toolset=="target"', { | 3611 ['_toolset=="target"', { |
| 3612 'ldflags': [ | 3612 'ldflags': [ |
| 3613 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG
IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/', | 3613 '-Wl,-R,\$$ORIGIN/instrumented_libraries/msan/lib/:\$$ORIG
IN/instrumented_libraries/msan/usr/lib/x86_64-linux-gnu/', |
| 3614 '-Wl,-z,origin', | 3614 '-Wl,-z,origin', |
| 3615 ], | 3615 ], |
| 3616 }], | 3616 }], |
| 3617 ], | 3617 ], |
| 3618 }], | 3618 }], |
| 3619 ['tsan==1', { |
| 3620 'target_conditions': [ |
| 3621 ['_toolset=="target"', { |
| 3622 'ldflags': [ |
| 3623 # Add RPATH to result binary to make it linking instrument
ed libraries ($ORIGIN means relative RPATH) |
| 3624 '-Wl,-R,\$$ORIGIN/instrumented_libraries/tsan/lib/:\$$ORIG
IN/instrumented_libraries/tsan/usr/lib/x86_64-linux-gnu/', |
| 3625 '-Wl,-z,origin', |
| 3626 ], |
| 3627 }], |
| 3628 ], |
| 3629 }], |
| 3619 ], | 3630 ], |
| 3620 }], | 3631 }], |
| 3621 ['use_custom_libcxx==1', { | 3632 ['use_custom_libcxx==1', { |
| 3622 'dependencies': [ | 3633 'dependencies': [ |
| 3623 '<(DEPTH)/third_party/libc++/libc++.gyp:libc++', | 3634 '<(DEPTH)/third_party/libc++/libc++.gyp:libc++', |
| 3624 '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi', | 3635 '<(DEPTH)/third_party/libc++abi/libc++abi.gyp:libc++abi', |
| 3625 ], | 3636 ], |
| 3626 }], | 3637 }], |
| 3627 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { | 3638 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { |
| 3628 'target_conditions' : [ | 3639 'target_conditions' : [ |
| (...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5022 # settings in target dicts. SYMROOT is a special case, because many other | 5033 # settings in target dicts. SYMROOT is a special case, because many other |
| 5023 # Xcode variables depend on it, including variables such as | 5034 # Xcode variables depend on it, including variables such as |
| 5024 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5025 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5026 # files to appear (when present) in the UI as actual files and not red | 5037 # files to appear (when present) in the UI as actual files and not red |
| 5027 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5028 # and therefore SYMROOT, needs to be set at the project level. | 5039 # and therefore SYMROOT, needs to be set at the project level. |
| 5029 'SYMROOT': '<(DEPTH)/xcodebuild', | 5040 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5030 }, | 5041 }, |
| 5031 } | 5042 } |
| OLD | NEW |