| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific | 7 # .gyp files should set chromium_code to 1 if they build Chromium-specific |
| 8 # code, as opposed to external code. This variable is used to control | 8 # code, as opposed to external code. This variable is used to control |
| 9 # such things as the set of warnings to enable, and whether warnings are | 9 # such things as the set of warnings to enable, and whether warnings are |
| 10 # treated as errors. | 10 # treated as errors. |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 # Compute the architecture that we're building for. Default to the | 100 # Compute the architecture that we're building for. Default to the |
| 101 # architecture that we're building on. | 101 # architecture that we're building on. |
| 102 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { | 102 ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |
| 103 # This handles the Linux platforms we generally deal with. Anything | 103 # This handles the Linux platforms we generally deal with. Anything |
| 104 # else gets passed through, which probably won't work very well; | 104 # else gets passed through, which probably won't work very well; |
| 105 # such hosts should pass an explicit target_arch to gyp. | 105 # such hosts should pass an explicit target_arch to gyp. |
| 106 # | 106 # |
| 107 # NOTE: currently only nacl is generating gyp files on an arm board. | 107 # NOTE: currently only nacl is generating gyp files on an arm board. |
| 108 # The arm.* -> arm substitution in chrome's common.gypi isn't | 108 # The arm.* -> arm substitution in chrome's common.gypi isn't |
| 109 # appropriate in that context as we actually use target_arch==arm | 109 # appropriate in that context as we actually use target_arch==arm |
| 110 # to me x86 -> arm cross compile. When actually running on an arm | 110 # to mean x86 -> arm cross compile. When actually running on an |
| 111 # board, we'll generate ia32 for now, so that the generation | 111 # arm board, we'll generate ia32 for now, so that the generation |
| 112 # succeeds. | 112 # succeeds. |
| 113 'target_arch%': | 113 'target_arch%': |
| 114 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a
rm.*/ia32/")' | 114 '<!(echo "<!pymod_do_main(detect_nacl_host_arch)" | sed -e "s/ar
m.*/ia32/")', |
| 115 |
| 115 }, { # OS!="linux" | 116 }, { # OS!="linux" |
| 116 'target_arch%': 'ia32', | 117 'target_arch%': 'ia32', |
| 117 }], | 118 }], |
| 118 ] | 119 ] |
| 119 }, | 120 }, |
| 120 # These come from the above variable scope. | 121 # These come from the above variable scope. |
| 121 'nacl_standalone%': '<(nacl_standalone)', | 122 'nacl_standalone%': '<(nacl_standalone)', |
| 122 'target_arch%': '<(target_arch)', | 123 'target_arch%': '<(target_arch)', |
| 123 'branding%': '<(branding)', | 124 'branding%': '<(branding)', |
| 124 'buildtype%': '<(buildtype)', | 125 'buildtype%': '<(buildtype)', |
| (...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 819 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 819 # files to appear (when present) in the UI as actual files and not red | 820 # files to appear (when present) in the UI as actual files and not red |
| 820 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 821 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 821 # and therefore SYMROOT, needs to be set at the project level. | 822 # and therefore SYMROOT, needs to be set at the project level. |
| 822 'SYMROOT': '<(DEPTH)/xcodebuild', | 823 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 823 }, | 824 }, |
| 824 'includes': [ | 825 'includes': [ |
| 825 'untrusted.gypi', | 826 'untrusted.gypi', |
| 826 ], | 827 ], |
| 827 } | 828 } |
| OLD | NEW |