OLD | NEW |
---|---|
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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 'pyautolib_sources': [ | 7 'pyautolib_sources': [ |
8 'app/chrome_dll_resource.h', | 8 'app/chrome_dll_resource.h', |
9 'common/pref_names.cc', | 9 'common/pref_names.cc', |
10 'common/pref_names.h', | 10 'common/pref_names.h', |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
499 '../third_party/libxml/libxml.gyp:libxml', | 499 '../third_party/libxml/libxml.gyp:libxml', |
500 ], | 500 ], |
501 'include_dirs': [ | 501 'include_dirs': [ |
502 '..', | 502 '..', |
503 ], | 503 ], |
504 'sources': [ | 504 'sources': [ |
505 'test/nacl/nacl_test.cc', | 505 'test/nacl/nacl_test.cc', |
506 'test/nacl/nacl_sandbox_test.cc' | 506 'test/nacl/nacl_sandbox_test.cc' |
507 ], | 507 ], |
508 'conditions': [ | 508 'conditions': [ |
509 ['OS=="win"', { | 509 ['OS=="win"', { |
jvoung - send to chromium...
2010/07/19 18:05:03
woh, when did this show up twice -- the 'OS=="win"
Victor Wang
2010/07/19 18:15:45
I am not sure I got it, I only see one OS==win...
jvoung - send to chromium...
2010/07/19 18:23:24
Ok, n/m I only see one now too. Might have been a
| |
510 'dependencies': [ | 510 'dependencies': [ |
511 'chrome_nacl_win64', | 511 'chrome_nacl_win64', |
512 'crash_service', # run time dependency | 512 'crash_service', # run time dependency |
513 'nacl_security_tests', # run time dependency | 513 'nacl_security_tests', # run time dependency |
514 'test_support_common', | 514 'test_support_common', |
515 '../google_update/google_update.gyp:google_update', | 515 '../google_update/google_update.gyp:google_update', |
516 '../views/views.gyp:views', | 516 '../views/views.gyp:views', |
jvoung - send to chromium...
2010/07/19 18:05:03
should the views also be conditional? It is in nac
Victor Wang
2010/07/19 18:15:45
I don't think so.
| |
517 # run time dependency | 517 # run time dependency |
518 '../webkit/webkit.gyp:npapi_test_plugin', | 518 '../webkit/webkit.gyp:npapi_test_plugin', |
519 '<(allocator_target)', | 519 ], |
520 'conditions': [ | |
521 ['win_use_allocator_shim==1', { | |
522 'dependencies': [ | |
523 '<(allocator_target)', | |
524 ], | |
525 }], | |
520 ], | 526 ], |
521 'link_settings': { | 527 'link_settings': { |
522 'libraries': [ | 528 'libraries': [ |
523 '-lOleAcc.lib', | 529 '-lOleAcc.lib', |
524 ], | 530 ], |
525 }, | 531 }, |
526 'configurations': { | 532 'configurations': { |
527 'Debug_Base': { | 533 'Debug_Base': { |
528 'msvs_settings': { | 534 'msvs_settings': { |
529 'VCLinkerTool': { | 535 'VCLinkerTool': { |
(...skipping 2189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2719 ] | 2725 ] |
2720 }], # 'coverage!=0' | 2726 }], # 'coverage!=0' |
2721 ], # 'conditions' | 2727 ], # 'conditions' |
2722 } | 2728 } |
2723 | 2729 |
2724 # Local Variables: | 2730 # Local Variables: |
2725 # tab-width:2 | 2731 # tab-width:2 |
2726 # indent-tabs-mode:nil | 2732 # indent-tabs-mode:nil |
2727 # End: | 2733 # End: |
2728 # vim: set expandtab tabstop=2 shiftwidth=2: | 2734 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |