| 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 4670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4681 'cflags!': [ | 4681 'cflags!': [ |
| 4682 '-pthread', # Not supported by Android toolchain. | 4682 '-pthread', # Not supported by Android toolchain. |
| 4683 ], | 4683 ], |
| 4684 'cflags': [ | 4684 'cflags': [ |
| 4685 '-ffunction-sections', | 4685 '-ffunction-sections', |
| 4686 '-funwind-tables', | 4686 '-funwind-tables', |
| 4687 '-g', | 4687 '-g', |
| 4688 '-fstack-protector', | 4688 '-fstack-protector', |
| 4689 '-fno-short-enums', | 4689 '-fno-short-enums', |
| 4690 '-finline-limit=64', | 4690 '-finline-limit=64', |
| 4691 '-Wa,--noexecstack', | |
| 4692 '<@(release_extra_cflags)', | 4691 '<@(release_extra_cflags)', |
| 4693 '--sysroot=<(android_ndk_sysroot)', | 4692 '--sysroot=<(android_ndk_sysroot)', |
| 4694 # NOTE: The stlport header include paths below are specified in | 4693 # NOTE: The stlport header include paths below are specified in |
| 4695 # cflags rather than include_dirs because they need to come | 4694 # cflags rather than include_dirs because they need to come |
| 4696 # after include_dirs. | 4695 # after include_dirs. |
| 4697 # The include ordering here is important; change with caution. | 4696 # The include ordering here is important; change with caution. |
| 4698 '-isystem<(android_stlport_include)', | 4697 '-isystem<(android_stlport_include)', |
| 4699 ], | 4698 ], |
| 4700 'defines': [ | 4699 'defines': [ |
| 4701 'ANDROID', | 4700 'ANDROID', |
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6100 # settings in target dicts. SYMROOT is a special case, because many other | 6099 # settings in target dicts. SYMROOT is a special case, because many other |
| 6101 # Xcode variables depend on it, including variables such as | 6100 # Xcode variables depend on it, including variables such as |
| 6102 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6101 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6103 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6102 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6104 # files to appear (when present) in the UI as actual files and not red | 6103 # files to appear (when present) in the UI as actual files and not red |
| 6105 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6104 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6106 # and therefore SYMROOT, needs to be set at the project level. | 6105 # and therefore SYMROOT, needs to be set at the project level. |
| 6107 'SYMROOT': '<(DEPTH)/xcodebuild', | 6106 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6108 }, | 6107 }, |
| 6109 } | 6108 } |
| OLD | NEW |