| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'nacl/nacl_defines.gypi', | 10 'nacl/nacl_defines.gypi', |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 }, | 440 }, |
| 441 { | 441 { |
| 442 'target_name': 'nacl_switches_win64', | 442 'target_name': 'nacl_switches_win64', |
| 443 'type': 'none', | 443 'type': 'none', |
| 444 'sources': [], | 444 'sources': [], |
| 445 }, | 445 }, |
| 446 ], | 446 ], |
| 447 }], | 447 }], |
| 448 ], | 448 ], |
| 449 }], | 449 }], |
| 450 ['disable_nacl!=1 and test_isolation_mode!="noop"', { |
| 451 'targets': [ |
| 452 { |
| 453 'target_name': 'nacl_loader_unittests_run', |
| 454 'type': 'none', |
| 455 'dependencies': [ |
| 456 'nacl_loader_unittests', |
| 457 ], |
| 458 'includes': [ |
| 459 '../build/isolate.gypi', |
| 460 'nacl_loader_unittests.isolate', |
| 461 ], |
| 462 'sources': [ |
| 463 'nacl_loader_unittests.isolate', |
| 464 ], |
| 465 }, |
| 466 ], |
| 467 }], |
| 450 ], | 468 ], |
| 451 'targets': [ | 469 'targets': [ |
| 452 { | 470 { |
| 453 'target_name': 'nacl_switches', | 471 'target_name': 'nacl_switches', |
| 454 'type': 'static_library', | 472 'type': 'static_library', |
| 455 'sources': [ | 473 'sources': [ |
| 456 'nacl/common/nacl_switches.cc', | 474 'nacl/common/nacl_switches.cc', |
| 457 'nacl/common/nacl_switches.h', | 475 'nacl/common/nacl_switches.h', |
| 458 ], | 476 ], |
| 459 'include_dirs': [ | 477 'include_dirs': [ |
| (...skipping 21 matching lines...) Expand all Loading... |
| 481 ], | 499 ], |
| 482 'include_dirs': [ | 500 'include_dirs': [ |
| 483 '..', | 501 '..', |
| 484 ], | 502 ], |
| 485 'dependencies': [ | 503 'dependencies': [ |
| 486 '../content/content.gyp:content_common', | 504 '../content/content.gyp:content_common', |
| 487 ], | 505 ], |
| 488 }, | 506 }, |
| 489 ] | 507 ] |
| 490 } | 508 } |
| OLD | NEW |