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 { | 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 197 ], | 197 ], |
| 198 }], | 198 }], |
| 199 ['target_arch=="arm"', { | 199 ['target_arch=="arm"', { |
| 200 'defines': [ | 200 'defines': [ |
| 201 'NACL_BUILD_ARCH=arm', | 201 'NACL_BUILD_ARCH=arm', |
| 202 'NACL_BUILD_SUBARCH=32', | 202 'NACL_BUILD_SUBARCH=32', |
| 203 'NACL_TARGET_ARCH=arm', | 203 'NACL_TARGET_ARCH=arm', |
| 204 'NACL_TARGET_SUBARCH=32', | 204 'NACL_TARGET_SUBARCH=32', |
| 205 ], | 205 ], |
| 206 }], | 206 }], |
| 207 ['target_arch=="mipsel"', { | |
| 208 'defines': [ | |
| 209 'NACL_BUILD_ARCH=mipsel', | |
|
Mark Seaborn
2013/09/20 23:11:17
Why not "mips" instead of "mipsel"? Then we don't
petarj
2013/09/23 17:49:24
Done.
| |
| 210 'NACL_BUILD_SUBARCH=32', | |
| 211 'NACL_TARGET_ARCH=mipsel', | |
| 212 'NACL_TARGET_SUBARCH=32', | |
| 213 ], | |
| 214 }], | |
| 207 ['linux2==1', { | 215 ['linux2==1', { |
| 208 'defines': ['LINUX2=1'], | 216 'defines': ['LINUX2=1'], |
| 209 }], | 217 }], |
| 210 ['OS=="win"', { | 218 ['OS=="win"', { |
| 211 'defines': [ 'NOMINMAX' ] | 219 'defines': [ 'NOMINMAX' ] |
| 212 }], | 220 }], |
| 213 ['coverage!=0', { | 221 ['coverage!=0', { |
| 214 'conditions': [ | 222 'conditions': [ |
| 215 ['OS=="mac"', { | 223 ['OS=="mac"', { |
| 216 'xcode_settings': { | 224 'xcode_settings': { |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 330 ], | 338 ], |
| 331 'conditions': [ | 339 'conditions': [ |
| 332 ['arm_neon==1', { | 340 ['arm_neon==1', { |
| 333 'cflags': [ '-mfpu=neon', ], | 341 'cflags': [ '-mfpu=neon', ], |
| 334 }, { | 342 }, { |
| 335 'cflags': [ '-mfpu=<(arm_fpu)', ], | 343 'cflags': [ '-mfpu=<(arm_fpu)', ], |
| 336 }] | 344 }] |
| 337 ], | 345 ], |
| 338 }], | 346 }], |
| 339 ], | 347 ], |
| 340 }, { # else: target_arch != "arm" | 348 }], |
| 349 ['target_arch=="mipsel"', { | |
| 350 # Copied from chromium build/common.gypi | |
| 351 'conditions': [ | |
| 352 ['mips_arch_variant=="mips32r2"', { | |
| 353 'cflags': ['-mips32r2'], | |
|
Mark Seaborn
2013/09/20 23:11:17
Indent by 1 fewer space (i.e. 2 spaces per indenta
petarj
2013/09/23 17:49:24
Done.
| |
| 354 }, { | |
| 355 'cflags': ['-mips32'], | |
|
Mark Seaborn
2013/09/20 23:11:17
Same here
petarj
2013/09/23 17:49:24
Done.
| |
| 356 }], | |
| 357 ], | |
| 358 }], | |
| 359 ['target_arch=="ia32" or target_arch=="x64"', { | |
| 341 'conditions': [ | 360 'conditions': [ |
| 342 ['target_arch=="x64"', { | 361 ['target_arch=="x64"', { |
| 343 'variables': { | 362 'variables': { |
| 344 'mbits_flag': '-m64', | 363 'mbits_flag': '-m64', |
| 345 }, | 364 }, |
| 346 }, { | 365 }, { |
| 347 'variables': { | 366 'variables': { |
| 348 'mbits_flag': '-m32', | 367 'mbits_flag': '-m32', |
| 349 } | 368 } |
| 350 },], | 369 },], |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 845 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 864 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 846 # files to appear (when present) in the UI as actual files and not red | 865 # files to appear (when present) in the UI as actual files and not red |
| 847 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 866 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 848 # and therefore SYMROOT, needs to be set at the project level. | 867 # and therefore SYMROOT, needs to be set at the project level. |
| 849 'SYMROOT': '<(DEPTH)/xcodebuild', | 868 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 850 }, | 869 }, |
| 851 'includes': [ | 870 'includes': [ |
| 852 'untrusted.gypi', | 871 'untrusted.gypi', |
| 853 ], | 872 ], |
| 854 } | 873 } |
| OLD | NEW |