Chromium Code Reviews| Index: remoting/remoting_test_driver_common.gyp |
| diff --git a/remoting/app_remoting_test.gyp b/remoting/remoting_test_driver_common.gyp |
| similarity index 51% |
| copy from remoting/app_remoting_test.gyp |
| copy to remoting/remoting_test_driver_common.gyp |
| index 8c330431f18f14fc32ffe3e29adc5aca09b9f32b..26383964654f5f587953da52832e2d485de74e2c 100644 |
| --- a/remoting/app_remoting_test.gyp |
| +++ b/remoting/remoting_test_driver_common.gyp |
| @@ -10,10 +10,9 @@ |
| 'target_defaults': { |
| 'type': 'none', |
| }, # target_defaults |
| - |
|
joedow
2015/06/08 18:35:20
Any reason this newline was removed?
|
| 'targets': [ |
| { |
| - 'target_name': 'ar_test_driver_common', |
| + 'target_name': 'remoting_test_driver_common', |
| 'type': 'static_library', |
| 'dependencies': [ |
| '../base/base.gyp:base', |
| @@ -23,7 +22,6 @@ |
| '../remoting/remoting.gyp:remoting_base', |
| '../remoting/remoting.gyp:remoting_client', |
| '../remoting/remoting.gyp:remoting_protocol', |
| - '../remoting/proto/chromotocol.gyp:chromotocol_proto_lib', |
| '../testing/gtest.gyp:gtest', |
| ], |
| 'defines': [ |
| @@ -32,41 +30,14 @@ |
| 'sources': [ |
| 'test/access_token_fetcher.cc', |
| 'test/access_token_fetcher.h', |
| - 'test/app_remoting_connected_client_fixture.cc', |
| - 'test/app_remoting_connected_client_fixture.h', |
| - 'test/app_remoting_test_driver_environment.cc', |
| - 'test/app_remoting_test_driver_environment.h', |
| 'test/refresh_token_store.cc', |
| 'test/refresh_token_store.h', |
| - 'test/remote_application_details.h', |
| 'test/remote_connection_observer.h', |
| - 'test/remote_host_info.cc', |
| - 'test/remote_host_info.h', |
| - 'test/remote_host_info_fetcher.cc', |
| - 'test/remote_host_info_fetcher.h', |
| 'test/test_chromoting_client.cc', |
| 'test/test_chromoting_client.h', |
| 'test/test_video_renderer.cc', |
| 'test/test_video_renderer.h', |
| ], |
| - }, # end of target 'ar_test_driver_common' |
| - { |
| - # An external version of the test driver tool which includes minimal tests |
| - 'target_name': 'ar_sample_test_driver', |
| - 'type': '<(gtest_target_type)', |
| - 'dependencies': [ |
| - 'ar_test_driver_common', |
| - ], |
| - 'defines': [ |
| - 'VERSION=<(version_full)', |
| - ], |
| - 'sources': [ |
| - 'test/app_remoting_test_driver.cc', |
| - 'test/app_remoting_test_driver_environment_app_details.cc', |
| - ], |
| - 'include_dirs': [ |
| - '../testing/gtest/include', |
| - ], |
| - }, # end of target 'ar_sample_test_driver' |
| + }, # end of target 'remoting_test_driver_common' |
| ], # end of targets |
| } |