| 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 1071 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1082 'ka', 'ku', 'kw', 'ms', 'ug' | 1082 'ka', 'ku', 'kw', 'ms', 'ug' |
| 1083 ], | 1083 ], |
| 1084 }], | 1084 }], |
| 1085 ['OS=="android"', { | 1085 ['OS=="android"', { |
| 1086 'grit_defines': ['-D', 'android'], | 1086 'grit_defines': ['-D', 'android'], |
| 1087 }], | 1087 }], |
| 1088 ['enable_extensions==1', { | 1088 ['enable_extensions==1', { |
| 1089 'grit_defines': ['-D', 'enable_extensions'], | 1089 'grit_defines': ['-D', 'enable_extensions'], |
| 1090 }], | 1090 }], |
| 1091 ['clang_use_chrome_plugins==1 and OS!="win"', { | 1091 ['clang_use_chrome_plugins==1 and OS!="win"', { |
| 1092 'clang_chrome_plugins_flags': | 1092 'variables': { |
| 1093 '<!(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)', | 1093 'clang_chrome_plugins_flags': [ |
| 1094 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
| 1095 ], |
| 1096 }, |
| 1097 'conditions': [ |
| 1098 ['chromeos==1', { |
| 1099 # TODO(rsleevi): http://crbug.com/123295 - Disabled on ChromeOS |
| 1100 # for now. |
| 1101 'clang_chrome_plugins_flags': [ |
| 1102 '<@(clang_chrome_plugins_flags)', |
| 1103 '-Xclang', |
| 1104 '-plugin-arg-find-bad-constructs', |
| 1105 '-Xclang', |
| 1106 '-skip-refcounted-dtors' |
| 1107 ], |
| 1108 }, { |
| 1109 'clang_chrome_plugins_flags': [ |
| 1110 '<@(clang_chrome_plugins_flags)', |
| 1111 ], |
| 1112 }], |
| 1113 ], |
| 1094 }], | 1114 }], |
| 1095 | 1115 |
| 1096 # Set use_ibus to 1 to enable ibus support. | 1116 # Set use_ibus to 1 to enable ibus support. |
| 1097 ['use_virtual_keyboard==1 and chromeos==1', { | 1117 ['use_virtual_keyboard==1 and chromeos==1', { |
| 1098 'use_ibus%': 1, | 1118 'use_ibus%': 1, |
| 1099 }, { | 1119 }, { |
| 1100 'use_ibus%': 0, | 1120 'use_ibus%': 0, |
| 1101 }], | 1121 }], |
| 1102 | 1122 |
| 1103 ['enable_web_intents_tag==1', { | 1123 ['enable_web_intents_tag==1', { |
| (...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2184 # also contain a default: branch. Chrome is full of that. | 2204 # also contain a default: branch. Chrome is full of that. |
| 2185 '-Wno-covered-switch-default', | 2205 '-Wno-covered-switch-default', |
| 2186 ], | 2206 ], |
| 2187 'cflags!': [ | 2207 'cflags!': [ |
| 2188 # Clang doesn't seem to know know this flag. | 2208 # Clang doesn't seem to know know this flag. |
| 2189 '-mfpmath=sse', | 2209 '-mfpmath=sse', |
| 2190 ], | 2210 ], |
| 2191 }], | 2211 }], |
| 2192 ['clang==1 and clang_use_chrome_plugins==1', { | 2212 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2193 'cflags': [ | 2213 'cflags': [ |
| 2194 '<(clang_chrome_plugins_flags)', | 2214 '<@(clang_chrome_plugins_flags)', |
| 2195 ], | 2215 ], |
| 2196 }], | 2216 }], |
| 2197 ['clang==1 and clang_load!=""', { | 2217 ['clang==1 and clang_load!=""', { |
| 2198 'cflags': [ | 2218 'cflags': [ |
| 2199 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2219 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 2200 ], | 2220 ], |
| 2201 }], | 2221 }], |
| 2202 ['clang==1 and clang_add_plugin!=""', { | 2222 ['clang==1 and clang_add_plugin!=""', { |
| 2203 'cflags': [ | 2223 'cflags': [ |
| 2204 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | 2224 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| (...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2619 # heavily. | 2639 # heavily. |
| 2620 '-Wno-c++11-extensions', | 2640 '-Wno-c++11-extensions', |
| 2621 | 2641 |
| 2622 # Warns on switches on enums that cover all enum values but | 2642 # Warns on switches on enums that cover all enum values but |
| 2623 # also contain a default: branch. Chrome is full of that. | 2643 # also contain a default: branch. Chrome is full of that. |
| 2624 '-Wno-covered-switch-default', | 2644 '-Wno-covered-switch-default', |
| 2625 ], | 2645 ], |
| 2626 }], | 2646 }], |
| 2627 ['clang==1 and clang_use_chrome_plugins==1', { | 2647 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2628 'OTHER_CFLAGS': [ | 2648 'OTHER_CFLAGS': [ |
| 2629 '<(clang_chrome_plugins_flags)', | 2649 '<@(clang_chrome_plugins_flags)', |
| 2630 ], | 2650 ], |
| 2631 }], | 2651 }], |
| 2632 ['clang==1 and clang_load!=""', { | 2652 ['clang==1 and clang_load!=""', { |
| 2633 'OTHER_CFLAGS': [ | 2653 'OTHER_CFLAGS': [ |
| 2634 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2654 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 2635 ], | 2655 ], |
| 2636 }], | 2656 }], |
| 2637 ['clang==1 and clang_add_plugin!=""', { | 2657 ['clang==1 and clang_add_plugin!=""', { |
| 2638 'OTHER_CFLAGS': [ | 2658 'OTHER_CFLAGS': [ |
| 2639 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', | 2659 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', |
| (...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3097 # settings in target dicts. SYMROOT is a special case, because many other | 3117 # settings in target dicts. SYMROOT is a special case, because many other |
| 3098 # Xcode variables depend on it, including variables such as | 3118 # Xcode variables depend on it, including variables such as |
| 3099 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3119 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3100 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3120 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3101 # files to appear (when present) in the UI as actual files and not red | 3121 # files to appear (when present) in the UI as actual files and not red |
| 3102 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3122 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3103 # and therefore SYMROOT, needs to be set at the project level. | 3123 # and therefore SYMROOT, needs to be set at the project level. |
| 3104 'SYMROOT': '<(DEPTH)/xcodebuild', | 3124 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3105 }, | 3125 }, |
| 3106 } | 3126 } |
| OLD | NEW |