| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 '-fdiagnostics-show-option', | 294 '-fdiagnostics-show-option', |
| 295 ], | 295 ], |
| 296 'cflags_c': [ | 296 'cflags_c': [ |
| 297 # Require defining functions as "foo(void)" rather than | 297 # Require defining functions as "foo(void)" rather than |
| 298 # "foo()" because, in C (but not C++), the latter | 298 # "foo()" because, in C (but not C++), the latter |
| 299 # defines a function with unspecified arguments rather | 299 # defines a function with unspecified arguments rather |
| 300 # than no arguments. | 300 # than no arguments. |
| 301 '-Wstrict-prototypes', | 301 '-Wstrict-prototypes', |
| 302 ], | 302 ], |
| 303 }], | 303 }], |
| 304 [ 'target_arch=="arm"', { | 304 ['target_arch=="arm"', { |
| 305 'cflags': [ | 305 'target_conditions': [ |
| 306 ['_toolset=="target"', { |
| 307 'cflags': [ |
| 306 '-Wno-abi', | 308 '-Wno-abi', |
| 307 '-fno-exceptions', | 309 '-fno-exceptions', |
| 308 '-Wall', | 310 '-Wall', |
| 309 '-fPIC', | 311 '-fPIC', |
| 310 '--sysroot=<(sysroot)', | 312 '--sysroot=<(sysroot)', |
| 311 ], | 313 ], |
| 312 'ldflags': [ | 314 'ldflags': [ |
| 313 '--sysroot=<(sysroot)', | 315 '--sysroot=<(sysroot)', |
| 314 ], | 316 ], |
| 315 # TODO(mcgrathr): This is copied from the arm section of | 317 # TODO(mcgrathr): This is copied from the arm section of |
| 316 # chromium/src/build/common.gypi, but these details really | 318 # chromium/src/build/common.gypi, but these details really |
| 317 # should be more fully harmonized and shared. | 319 # should be more fully harmonized and shared. |
| 318 'conditions': [ | 320 'conditions': [ |
| 319 ['arm_thumb==1', { | 321 ['arm_thumb==1', { |
| 320 'cflags': [ | 322 'cflags': [ |
| 321 '-mthumb', | 323 '-mthumb', |
| 322 ] | 324 ] |
| 323 }], | 325 }], |
| 324 ['arm_version==7', { | 326 ['arm_version==7', { |
| 325 'cflags': [ | 327 'cflags': [ |
| 326 '-march=armv7-a', | 328 '-march=armv7-a', |
| 327 '-mtune=cortex-a9', | 329 '-mtune=cortex-a9', |
| 328 '-mfloat-abi=<(arm_float_abi)', | 330 '-mfloat-abi=<(arm_float_abi)', |
| 329 ], | 331 ], |
| 330 'conditions': [ | 332 'conditions': [ |
| 331 ['arm_neon==1', { | 333 ['arm_neon==1', { |
| 332 'cflags': [ '-mfpu=neon', ], | 334 'cflags': [ '-mfpu=neon', ], |
| 333 }, { | 335 }, { |
| 334 'cflags': [ '-mfpu=<(arm_fpu)', ], | 336 'cflags': [ '-mfpu=<(arm_fpu)', ], |
| 335 }] | 337 }] |
| 336 ], | 338 ], |
| 337 }], | 339 }], |
| 338 ], | 340 ], |
| 339 }], | 341 }], |
| 340 ['target_arch=="mipsel"', { | 342 ], |
| 341 # Copied from chromium build/common.gypi | 343 }], |
| 342 'conditions': [ | 344 ['target_arch=="mipsel"', { |
| 343 ['mips_arch_variant=="mips32r2"', { | 345 'target_conditions': [ |
| 344 'cflags': ['-mips32r2'], | 346 ['_toolset=="target"', { |
| 345 }, { | 347 # Copied from chromium build/common.gypi |
| 346 'cflags': ['-mips32'], | 348 'conditions': [ |
| 347 }], | 349 ['mips_arch_variant=="mips32r2"', { |
| 348 ], | 350 'cflags': ['-mips32r2'], |
| 349 }], | 351 }, { |
| 350 ['target_arch=="ia32" or target_arch=="x64"', { | 352 'cflags': ['-mips32'], |
| 351 'conditions': [ | 353 }], |
| 352 ['target_arch=="x64"', { | 354 ], |
| 353 'variables': { | 355 }], |
| 354 'mbits_flag': '-m64', | 356 ], |
| 355 }, | 357 }], |
| 356 }, { | 358 ['target_arch=="ia32" or target_arch=="x64"', { |
| 357 'variables': { | 359 'conditions': [ |
| 358 'mbits_flag': '-m32', | 360 ['target_arch=="x64"', { |
| 359 } | 361 'variables': { |
| 360 },], | 362 'mbits_flag': '-m64', |
| 361 ], | 363 }, |
| 362 'asflags': [ | 364 }, { |
| 363 '<(mbits_flag)', | 365 'variables': { |
| 364 ], | 366 'mbits_flag': '-m32', |
| 365 'cflags': [ | 367 } |
| 366 '<(mbits_flag)', | 368 },], |
| 367 '-fno-exceptions', | 369 ], |
| 368 '-Wall', | 370 'asflags': [ |
| 369 ], | 371 '<(mbits_flag)', |
| 370 'ldflags': [ | 372 ], |
| 371 '<(mbits_flag)', | 373 'cflags': [ |
| 372 ], | 374 '<(mbits_flag)', |
| 375 '-fno-exceptions', |
| 376 '-Wall', |
| 377 ], |
| 378 'ldflags': [ |
| 379 '<(mbits_flag)', |
| 380 ], |
| 373 }], | 381 }], |
| 374 ], | 382 ], |
| 375 'cflags_cc': [ | 383 'cflags_cc': [ |
| 376 '-fno-rtti', | 384 '-fno-rtti', |
| 377 '-fno-threadsafe-statics', | 385 '-fno-threadsafe-statics', |
| 378 ], | 386 ], |
| 379 'ldflags': [ | 387 'ldflags': [ |
| 380 '-pthread', | 388 '-pthread', |
| 381 '-Wl,-z,noexecstack', | 389 '-Wl,-z,noexecstack', |
| 382 ], | 390 ], |
| (...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 783 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 776 # files to appear (when present) in the UI as actual files and not red | 784 # files to appear (when present) in the UI as actual files and not red |
| 777 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 785 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 778 # and therefore SYMROOT, needs to be set at the project level. | 786 # and therefore SYMROOT, needs to be set at the project level. |
| 779 'SYMROOT': '<(DEPTH)/xcodebuild', | 787 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 780 }, | 788 }, |
| 781 'includes': [ | 789 'includes': [ |
| 782 'untrusted.gypi', | 790 'untrusted.gypi', |
| 783 ], | 791 ], |
| 784 } | 792 } |
| OLD | NEW |