| 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 4310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4321 }], | 4321 }], |
| 4322 ], | 4322 ], |
| 4323 }], | 4323 }], |
| 4324 ['use_instrumented_libraries==1', { | 4324 ['use_instrumented_libraries==1', { |
| 4325 'dependencies': [ | 4325 'dependencies': [ |
| 4326 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie
s.gyp:instrumented_libraries', | 4326 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie
s.gyp:instrumented_libraries', |
| 4327 ], | 4327 ], |
| 4328 }], | 4328 }], |
| 4329 ['use_custom_libcxx==1', { | 4329 ['use_custom_libcxx==1', { |
| 4330 'dependencies': [ | 4330 'dependencies': [ |
| 4331 '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy', | 4331 '<(DEPTH)/buildtools/third_party/libc++/libc++.gyp:libcxx_proxy', |
| 4332 ], | 4332 ], |
| 4333 }], | 4333 }], |
| 4334 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { | 4334 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { |
| 4335 'target_conditions' : [ | 4335 'target_conditions' : [ |
| 4336 # crazy_linker has an upstream gyp file we can't edit, and we | 4336 # crazy_linker has an upstream gyp file we can't edit, and we |
| 4337 # don't want to instrument it. | 4337 # don't want to instrument it. |
| 4338 ['_toolset=="target" and _target_name!="crazy_linker"', { | 4338 ['_toolset=="target" and _target_name!="crazy_linker"', { |
| 4339 'cflags': [ | 4339 'cflags': [ |
| 4340 '-finstrument-functions', | 4340 '-finstrument-functions', |
| 4341 # Allow mmx intrinsics to inline, so that the | 4341 # Allow mmx intrinsics to inline, so that the |
| (...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5844 # settings in target dicts. SYMROOT is a special case, because many other | 5844 # settings in target dicts. SYMROOT is a special case, because many other |
| 5845 # Xcode variables depend on it, including variables such as | 5845 # Xcode variables depend on it, including variables such as |
| 5846 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5846 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5847 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5847 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5848 # files to appear (when present) in the UI as actual files and not red | 5848 # files to appear (when present) in the UI as actual files and not red |
| 5849 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5849 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5850 # and therefore SYMROOT, needs to be set at the project level. | 5850 # and therefore SYMROOT, needs to be set at the project level. |
| 5851 'SYMROOT': '<(DEPTH)/xcodebuild', | 5851 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5852 }, | 5852 }, |
| 5853 } | 5853 } |
| OLD | NEW |