| 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', | 561 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', |
| 562 'renderer/media/media_stream_dependency_factory_unittest.cc', | 562 'renderer/media/media_stream_dependency_factory_unittest.cc', |
| 563 'renderer/media/media_stream_dispatcher_unittest.cc', | 563 'renderer/media/media_stream_dispatcher_unittest.cc', |
| 564 'renderer/media/media_stream_impl_unittest.cc', | 564 'renderer/media/media_stream_impl_unittest.cc', |
| 565 'renderer/media/rtc_peer_connection_handler_unittest.cc', | 565 'renderer/media/rtc_peer_connection_handler_unittest.cc', |
| 566 'renderer/media/webrtc_audio_device_unittest.cc', | 566 'renderer/media/webrtc_audio_device_unittest.cc', |
| 567 ], | 567 ], |
| 568 'dependencies': [ | 568 'dependencies': [ |
| 569 '../third_party/libjingle/libjingle.gyp:libpeerconnection', | 569 '../third_party/libjingle/libjingle.gyp:libpeerconnection', |
| 570 '../third_party/webrtc/modules/modules.gyp:video_capture_module', | 570 '../third_party/webrtc/modules/modules.gyp:video_capture_module', |
| 571 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co
re', |
| 571 ] | 572 ] |
| 572 }], | 573 }], |
| 573 # TODO(jrg): remove the OS=="android" section? | 574 # TODO(jrg): remove the OS=="android" section? |
| 574 # http://crbug.com/113172 | 575 # http://crbug.com/113172 |
| 575 # Understand better how media_stream_ is tied into Chromium. | 576 # Understand better how media_stream_ is tied into Chromium. |
| 576 ['enable_webrtc==0 and OS=="android"', { | 577 ['enable_webrtc==0 and OS=="android"', { |
| 577 'sources/': [ | 578 'sources/': [ |
| 578 ['exclude', '^renderer/media/media_stream_'], | 579 ['exclude', '^renderer/media/media_stream_'], |
| 579 ], | 580 ], |
| 580 }], | 581 }], |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1050 'additional_src_dirs': ['../content/public/android/javatests/',], | 1051 'additional_src_dirs': ['../content/public/android/javatests/',], |
| 1051 'resource_dir': '../shell_apk/res', | 1052 'resource_dir': '../shell_apk/res', |
| 1052 'is_test_apk': 1, | 1053 'is_test_apk': 1, |
| 1053 }, | 1054 }, |
| 1054 'includes': [ '../build/java_apk.gypi' ], | 1055 'includes': [ '../build/java_apk.gypi' ], |
| 1055 }, | 1056 }, |
| 1056 ], | 1057 ], |
| 1057 }], | 1058 }], |
| 1058 ], | 1059 ], |
| 1059 } | 1060 } |
| OLD | NEW |