| 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 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1835 # Keep the code under #ifndef NVALGRIND. | 1835 # Keep the code under #ifndef NVALGRIND. |
| 1836 'release_valgrind_build': 1, | 1836 'release_valgrind_build': 1, |
| 1837 }], | 1837 }], |
| 1838 | 1838 |
| 1839 # Enable RLZ on Win, Mac, iOS and ChromeOS. | 1839 # Enable RLZ on Win, Mac, iOS and ChromeOS. |
| 1840 ['branding=="Chrome" and (OS=="win" or OS=="mac" or OS=="ios" or chromeos=
=1)', { | 1840 ['branding=="Chrome" and (OS=="win" or OS=="mac" or OS=="ios" or chromeos=
=1)', { |
| 1841 'enable_rlz%': 1, | 1841 'enable_rlz%': 1, |
| 1842 }], | 1842 }], |
| 1843 | 1843 |
| 1844 # Set default compiler flags depending on ARM version. | 1844 # Set default compiler flags depending on ARM version. |
| 1845 ['arm_version==5 and android_webview_build==0', { | |
| 1846 # Flags suitable for Android emulator | |
| 1847 'arm_arch%': 'armv5te', | |
| 1848 'arm_tune%': 'xscale', | |
| 1849 'arm_fpu%': '', | |
| 1850 'arm_float_abi%': 'soft', | |
| 1851 'arm_thumb%': 0, | |
| 1852 }], | |
| 1853 ['arm_version==6 and android_webview_build==0', { | 1845 ['arm_version==6 and android_webview_build==0', { |
| 1854 'arm_arch%': 'armv6', | 1846 'arm_arch%': 'armv6', |
| 1855 'arm_tune%': '', | 1847 'arm_tune%': '', |
| 1856 'arm_fpu%': '', | 1848 'arm_fpu%': '', |
| 1857 'arm_float_abi%': 'soft', | 1849 'arm_float_abi%': 'soft', |
| 1858 'arm_thumb%': 0, | 1850 'arm_thumb%': 0, |
| 1859 }], | 1851 }], |
| 1860 ['arm_version==7 and android_webview_build==0', { | 1852 ['arm_version==7 and android_webview_build==0', { |
| 1861 'arm_arch%': 'armv7-a', | 1853 'arm_arch%': 'armv7-a', |
| 1862 'arm_tune%': 'cortex-a8', | 1854 'arm_tune%': 'cortex-a8', |
| (...skipping 2942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4805 # settings in target dicts. SYMROOT is a special case, because many other | 4797 # settings in target dicts. SYMROOT is a special case, because many other |
| 4806 # Xcode variables depend on it, including variables such as | 4798 # Xcode variables depend on it, including variables such as |
| 4807 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4799 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4808 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4800 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4809 # files to appear (when present) in the UI as actual files and not red | 4801 # files to appear (when present) in the UI as actual files and not red |
| 4810 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4802 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4811 # and therefore SYMROOT, needs to be set at the project level. | 4803 # and therefore SYMROOT, needs to be set at the project level. |
| 4812 'SYMROOT': '<(DEPTH)/xcodebuild', | 4804 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4813 }, | 4805 }, |
| 4814 } | 4806 } |
| OLD | NEW |