Chromium Code Reviews| 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 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1773 'enable_mpeg2ts_stream_parser%': 1, | 1773 'enable_mpeg2ts_stream_parser%': 1, |
| 1774 'video_hole%': 1, | 1774 'video_hole%': 1, |
| 1775 }], | 1775 }], |
| 1776 ], | 1776 ], |
| 1777 }], | 1777 }], |
| 1778 ['android_webview_build==1 or android_webview_telemetry_build==1', { | 1778 ['android_webview_build==1 or android_webview_telemetry_build==1', { |
| 1779 # When building the WebView in the Android tree, jarjar will remap all | 1779 # When building the WebView in the Android tree, jarjar will remap all |
| 1780 # the class names, so the JNI generator needs to know this. | 1780 # the class names, so the JNI generator needs to know this. |
| 1781 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , | 1781 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , |
| 1782 }], | 1782 }], |
| 1783 ['OS=="linux" and target_arch!="mipsel"', { | 1783 ['OS=="linux" and target_arch!="mipsel" and target_arch!="arm"', { |
| 1784 # TODO(thakis): This is here to measure perf for a while. | 1784 # TODO(thakis): This is here to measure perf for a while. |
| 1785 'clang%': 1, | 1785 'clang%': 1, |
| 1786 }], # OS=="mac" | 1786 }], # OS=="mac" |
| 1787 ['OS=="mac"', { | 1787 ['OS=="mac"', { |
| 1788 'conditions': [ | 1788 'conditions': [ |
| 1789 # All Chrome builds have breakpad symbols, but only process the | 1789 # All Chrome builds have breakpad symbols, but only process the |
| 1790 # symbols from official builds. | 1790 # symbols from official builds. |
| 1791 ['(branding=="Chrome" and buildtype=="Official")', { | 1791 ['(branding=="Chrome" and buildtype=="Official")', { |
| 1792 'mac_strip_release%': 1, | 1792 'mac_strip_release%': 1, |
| 1793 }], | 1793 }], |
| (...skipping 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4261 ['binutils_version>=223', { | 4261 ['binutils_version>=223', { |
| 4262 # Newer binutils don't set DT_RPATH unless you disable "new" dtags | 4262 # Newer binutils don't set DT_RPATH unless you disable "new" dtags |
| 4263 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. | 4263 # and the new DT_RUNPATH doesn't work without --no-as-needed flag. |
| 4264 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags | 4264 # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags |
| 4265 # inside this file to allow usage of --no-as-needed and removal of | 4265 # inside this file to allow usage of --no-as-needed and removal of |
| 4266 # this flag. | 4266 # this flag. |
| 4267 'ldflags': [ | 4267 'ldflags': [ |
| 4268 '-Wl,--disable-new-dtags', | 4268 '-Wl,--disable-new-dtags', |
| 4269 ], | 4269 ], |
| 4270 }], | 4270 }], |
| 4271 # TODO(sbc): remove this once we switch to clang or gcc >= 4.8 for | |
| 4272 # for ARM/linux cross compiling. http://crbug.com/395832 | |
| 4273 ['gcc_version>=46 and gcc_version<48 and clang==0', { | |
| 4274 'target_conditions': [ | |
| 4275 ['_toolset=="target"', { | |
| 4276 'cflags_cc': [ | |
| 4277 '-std=gnu++0x', | |
|
Nico
2014/07/22 22:26:26
Oh, I missed this. I really don't want to have a b
Sam Clegg
2014/07/23 00:35:50
OK. I'll keep pushing forward with clang.
Should
Nico
2014/07/23 00:40:10
Yes. That's blocked on someone (likely me :-) ) to
| |
| 4278 '-fpermissive', | |
| 4279 ], | |
| 4280 }], | |
| 4281 ], | |
| 4282 }], | |
| 4271 ['gcc_version>=48 and clang==0', { | 4283 ['gcc_version>=48 and clang==0', { |
| 4272 'target_conditions': [ | 4284 'target_conditions': [ |
| 4273 ['_toolset=="target"', { | 4285 ['_toolset=="target"', { |
| 4274 'cflags_cc': [ | 4286 'cflags_cc': [ |
| 4275 '-std=gnu++11', | 4287 '-std=gnu++11', |
| 4276 # See comment for -Wno-c++11-narrowing. | 4288 # See comment for -Wno-c++11-narrowing. |
| 4277 '-Wno-narrowing', | 4289 '-Wno-narrowing', |
| 4278 # TODO(thakis): Remove, http://crbug.com/263960 | 4290 # TODO(thakis): Remove, http://crbug.com/263960 |
| 4279 '-Wno-literal-suffix', | 4291 '-Wno-literal-suffix', |
| 4280 ], | 4292 ], |
| (...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5655 # settings in target dicts. SYMROOT is a special case, because many other | 5667 # settings in target dicts. SYMROOT is a special case, because many other |
| 5656 # Xcode variables depend on it, including variables such as | 5668 # Xcode variables depend on it, including variables such as |
| 5657 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5669 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5658 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5670 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5659 # files to appear (when present) in the UI as actual files and not red | 5671 # files to appear (when present) in the UI as actual files and not red |
| 5660 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5672 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5661 # and therefore SYMROOT, needs to be set at the project level. | 5673 # and therefore SYMROOT, needs to be set at the project level. |
| 5662 'SYMROOT': '<(DEPTH)/xcodebuild', | 5674 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5663 }, | 5675 }, |
| 5664 } | 5676 } |
| OLD | NEW |