| 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 3888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3899 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie
s.gyp:instrumented_libraries', | 3899 '<(DEPTH)/third_party/instrumented_libraries/instrumented_librarie
s.gyp:instrumented_libraries', |
| 3900 ], | 3900 ], |
| 3901 }], | 3901 }], |
| 3902 ['use_custom_libcxx==1', { | 3902 ['use_custom_libcxx==1', { |
| 3903 'dependencies': [ | 3903 'dependencies': [ |
| 3904 '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy', | 3904 '<(DEPTH)/third_party/libc++/libc++.gyp:libcxx_proxy', |
| 3905 ], | 3905 ], |
| 3906 }], | 3906 }], |
| 3907 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { | 3907 ['order_profiling!=0 and (chromeos==1 or OS=="linux" or OS=="android")
', { |
| 3908 'target_conditions' : [ | 3908 'target_conditions' : [ |
| 3909 ['_toolset=="target"', { | 3909 # crazy_linker has an upstream gyp file we can't edit, and we |
| 3910 # don't want to instrument it. |
| 3911 ['_toolset=="target" and _target_name!="crazy_linker"', { |
| 3910 'cflags': [ | 3912 'cflags': [ |
| 3911 '-finstrument-functions', | 3913 '-finstrument-functions', |
| 3912 # Allow mmx intrinsics to inline, so that the | 3914 # Allow mmx intrinsics to inline, so that the |
| 3913 #0 compiler can expand the intrinsics. | 3915 #0 compiler can expand the intrinsics. |
| 3914 '-finstrument-functions-exclude-file-list=mmintrin.h', | 3916 '-finstrument-functions-exclude-file-list=mmintrin.h', |
| 3915 ], | 3917 ], |
| 3916 }], | 3918 }], |
| 3917 ['_toolset=="target" and OS=="android"', { | 3919 ['_toolset=="target" and OS=="android"', { |
| 3918 'cflags': [ | 3920 'cflags': [ |
| 3919 # Avoids errors with current NDK: | 3921 # Avoids errors with current NDK: |
| (...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5365 # settings in target dicts. SYMROOT is a special case, because many other | 5367 # settings in target dicts. SYMROOT is a special case, because many other |
| 5366 # Xcode variables depend on it, including variables such as | 5368 # Xcode variables depend on it, including variables such as |
| 5367 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5369 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5368 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5370 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5369 # files to appear (when present) in the UI as actual files and not red | 5371 # files to appear (when present) in the UI as actual files and not red |
| 5370 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5372 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5371 # and therefore SYMROOT, needs to be set at the project level. | 5373 # and therefore SYMROOT, needs to be set at the project level. |
| 5372 'SYMROOT': '<(DEPTH)/xcodebuild', | 5374 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5373 }, | 5375 }, |
| 5374 } | 5376 } |
| OLD | NEW |