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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'test_support_content', | 8 'target_name': 'test_support_content', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'defines!': ['CONTENT_IMPLEMENTATION'], | 10 'defines!': ['CONTENT_IMPLEMENTATION'], |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 514 'target_name': 'content_browsertests', | 514 'target_name': 'content_browsertests', |
| 515 'type': 'executable', | 515 'type': 'executable', |
| 516 'defines!': ['CONTENT_IMPLEMENTATION'], | 516 'defines!': ['CONTENT_IMPLEMENTATION'], |
| 517 'dependencies': [ | 517 'dependencies': [ |
| 518 'content_gpu', | 518 'content_gpu', |
| 519 'content_plugin', | 519 'content_plugin', |
| 520 'content_renderer', | 520 'content_renderer', |
| 521 'content_shell_lib', | 521 'content_shell_lib', |
| 522 'test_support_content', | 522 'test_support_content', |
| 523 '../base/base.gyp:test_support_base', | 523 '../base/base.gyp:test_support_base', |
| 524 '../ipc/ipc.gyp:test_support_ipc', | |
| 524 '../net/net.gyp:net_test_support', | 525 '../net/net.gyp:net_test_support', |
| 526 '../ppapi/ppapi_internal.gyp:ppapi_host', | |
| 527 '../ppapi/ppapi_internal.gyp:ppapi_proxy', | |
| 528 '../ppapi/ppapi_internal.gyp:ppapi_shared', | |
| 529 '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', | |
| 525 '../skia/skia.gyp:skia', | 530 '../skia/skia.gyp:skia', |
| 526 '../testing/gtest.gyp:gtest', | 531 '../testing/gtest.gyp:gtest', |
| 527 '../ui/ui.gyp:ui', | 532 '../ui/ui.gyp:ui', |
| 528 '../webkit/support/webkit_support.gyp:glue', | 533 '../webkit/support/webkit_support.gyp:glue', |
| 529 ], | 534 ], |
| 530 'include_dirs': [ | 535 'include_dirs': [ |
| 531 '..', | 536 '..', |
| 532 ], | 537 ], |
| 533 'defines': [ | 538 'defines': [ |
| 534 'HAS_OUT_OF_PROC_TEST_RUNNER', | 539 'HAS_OUT_OF_PROC_TEST_RUNNER', |
| 535 ], | 540 ], |
| 536 'sources': [ | 541 'sources': [ |
| 537 'test/content_browser_test.h', | 542 'test/content_browser_test.h', |
| 538 'test/content_browser_test.cc', | 543 'test/content_browser_test.cc', |
| 539 'test/content_test_launcher.cc', | 544 'test/content_test_launcher.cc', |
| 545 'renderer/pepper/pepper_file_chooser_host_browsertest.cc', | |
|
jam
2012/07/18 00:52:19
did you mean to add this to content_unittests targ
brettw
2012/07/18 19:15:33
Do I lose anything by moving it? I thought I neede
jam
2012/07/18 21:45:40
I'm not sure what you mean by needing a browsertes
| |
| 540 ], | 546 ], |
| 541 'conditions': [ | 547 'conditions': [ |
| 542 ['OS=="win"', { | 548 ['OS=="win"', { |
| 543 'resource_include_dirs': [ | 549 'resource_include_dirs': [ |
| 544 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 550 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 545 ], | 551 ], |
| 546 'sources': [ | 552 'sources': [ |
| 547 'shell/resource.h', | 553 'shell/resource.h', |
| 548 'shell/shell.rc', | 554 'shell/shell.rc', |
| 549 # TODO: It would be nice to have these pulled in | 555 # TODO: It would be nice to have these pulled in |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 676 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', | 682 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', |
| 677 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', | 683 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', |
| 678 ], | 684 ], |
| 679 }, | 685 }, |
| 680 'includes': [ '../build/apk_test.gypi' ], | 686 'includes': [ '../build/apk_test.gypi' ], |
| 681 }, | 687 }, |
| 682 ], | 688 ], |
| 683 }], | 689 }], |
| 684 ], | 690 ], |
| 685 } | 691 } |
| OLD | NEW |