| 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 3845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3856 'ldflags': [ | 3856 'ldflags': [ |
| 3857 '-m32', | 3857 '-m32', |
| 3858 ], | 3858 ], |
| 3859 'conditions': [ | 3859 'conditions': [ |
| 3860 # Use gold linker for Android ia32 target. | 3860 # Use gold linker for Android ia32 target. |
| 3861 ['OS=="android"', { | 3861 ['OS=="android"', { |
| 3862 'ldflags': [ | 3862 'ldflags': [ |
| 3863 '-fuse-ld=gold', | 3863 '-fuse-ld=gold', |
| 3864 ], | 3864 ], |
| 3865 }], | 3865 }], |
| 3866 # Install packages have started cropping up with | |
| 3867 # different headers between the 32-bit and 64-bit | |
| 3868 # versions, so we have to shadow those differences off | |
| 3869 # and make sure a 32-bit-on-64-bit build picks up the | |
| 3870 # right files. | |
| 3871 # For android build, use NDK headers instead of host headers | |
| 3872 ['host_arch!="ia32" and OS!="android"', { | |
| 3873 'include_dirs+': [ | |
| 3874 '/usr/include32', | |
| 3875 ], | |
| 3876 }], | |
| 3877 ], | 3866 ], |
| 3878 }], | 3867 }], |
| 3879 ], | 3868 ], |
| 3880 }], | 3869 }], |
| 3881 ['target_arch=="x64"', { | 3870 ['target_arch=="x64"', { |
| 3882 'target_conditions': [ | 3871 'target_conditions': [ |
| 3883 ['_toolset=="target"', { | 3872 ['_toolset=="target"', { |
| 3884 'conditions': [ | 3873 'conditions': [ |
| 3885 # Use gold linker for Android x64 target. | 3874 # Use gold linker for Android x64 target. |
| 3886 ['OS=="android"', { | 3875 ['OS=="android"', { |
| (...skipping 2310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6197 # settings in target dicts. SYMROOT is a special case, because many other | 6186 # settings in target dicts. SYMROOT is a special case, because many other |
| 6198 # Xcode variables depend on it, including variables such as | 6187 # Xcode variables depend on it, including variables such as |
| 6199 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6188 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6200 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6189 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6201 # files to appear (when present) in the UI as actual files and not red | 6190 # files to appear (when present) in the UI as actual files and not red |
| 6202 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6191 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6203 # and therefore SYMROOT, needs to be set at the project level. | 6192 # and therefore SYMROOT, needs to be set at the project level. |
| 6204 'SYMROOT': '<(DEPTH)/xcodebuild', | 6193 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6205 }, | 6194 }, |
| 6206 } | 6195 } |
| OLD | NEW |