| 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 3647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3658 }], | 3658 }], |
| 3659 ['OS=="android"', { | 3659 ['OS=="android"', { |
| 3660 'variables': { | 3660 'variables': { |
| 3661 'release_optimize%': 's', | 3661 'release_optimize%': 's', |
| 3662 }, | 3662 }, |
| 3663 'ldflags': [ | 3663 'ldflags': [ |
| 3664 # Warn in case of text relocations. | 3664 # Warn in case of text relocations. |
| 3665 '-Wl,--warn-shared-textrel', | 3665 '-Wl,--warn-shared-textrel', |
| 3666 ], | 3666 ], |
| 3667 }], | 3667 }], |
| 3668 ['clang==1', { | |
| 3669 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed | |
| 3670 # and the fix is in chromium. | |
| 3671 'cflags': [ '-fno-slp-vectorize', ], | |
| 3672 }], | |
| 3673 ['profiling==1', { | 3668 ['profiling==1', { |
| 3674 'cflags': [ | 3669 'cflags': [ |
| 3675 '-fno-omit-frame-pointer', | 3670 '-fno-omit-frame-pointer', |
| 3676 '-g', | 3671 '-g', |
| 3677 ], | 3672 ], |
| 3678 'conditions' : [ | 3673 'conditions' : [ |
| 3679 ['profiling_full_stack_frames==1', { | 3674 ['profiling_full_stack_frames==1', { |
| 3680 'cflags': [ | 3675 'cflags': [ |
| 3681 '-fno-inline', | 3676 '-fno-inline', |
| 3682 '-fno-optimize-sibling-calls', | 3677 '-fno-optimize-sibling-calls', |
| (...skipping 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4796 # the -Wobjc-missing-property-synthesis flag. | 4791 # the -Wobjc-missing-property-synthesis flag. |
| 4797 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', | 4792 'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES', |
| 4798 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', | 4793 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
| 4799 'WARNING_CFLAGS': [ | 4794 'WARNING_CFLAGS': [ |
| 4800 # This warns on selectors from Cocoa headers (-length, -set). | 4795 # This warns on selectors from Cocoa headers (-length, -set). |
| 4801 # cfe-dev is currently discussing the merits of this warning. | 4796 # cfe-dev is currently discussing the merits of this warning. |
| 4802 # TODO(thakis): Reevaluate what to do with this, based one | 4797 # TODO(thakis): Reevaluate what to do with this, based one |
| 4803 # cfe-dev discussion. | 4798 # cfe-dev discussion. |
| 4804 '-Wno-selector-type-mismatch', | 4799 '-Wno-selector-type-mismatch', |
| 4805 ], | 4800 ], |
| 4806 'OTHER_CFLAGS': [ | |
| 4807 # TODO(thakis): Remove once http://llvm.org/PR20354 is fixed | |
| 4808 # and the fix is in chromium. | |
| 4809 '-fno-slp-vectorize', | |
| 4810 ], | |
| 4811 | |
| 4812 'conditions': [ | 4801 'conditions': [ |
| 4813 ['clang_xcode==0', { | 4802 ['clang_xcode==0', { |
| 4814 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', | 4803 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', |
| 4815 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', | 4804 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', |
| 4816 }], | 4805 }], |
| 4817 ], | 4806 ], |
| 4818 }], | 4807 }], |
| 4819 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { | 4808 ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', { |
| 4820 'OTHER_CFLAGS': [ | 4809 'OTHER_CFLAGS': [ |
| 4821 '<@(clang_chrome_plugins_flags)', | 4810 '<@(clang_chrome_plugins_flags)', |
| (...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5793 # settings in target dicts. SYMROOT is a special case, because many other | 5782 # settings in target dicts. SYMROOT is a special case, because many other |
| 5794 # Xcode variables depend on it, including variables such as | 5783 # Xcode variables depend on it, including variables such as |
| 5795 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5784 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5796 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5785 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5797 # files to appear (when present) in the UI as actual files and not red | 5786 # files to appear (when present) in the UI as actual files and not red |
| 5798 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5787 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5799 # and therefore SYMROOT, needs to be set at the project level. | 5788 # and therefore SYMROOT, needs to be set at the project level. |
| 5800 'SYMROOT': '<(DEPTH)/xcodebuild', | 5789 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5801 }, | 5790 }, |
| 5802 } | 5791 } |
| OLD | NEW |