| 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 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', | 569 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', |
| 570 'renderer/media/media_stream_dependency_factory_unittest.cc', | 570 'renderer/media/media_stream_dependency_factory_unittest.cc', |
| 571 'renderer/media/media_stream_dispatcher_unittest.cc', | 571 'renderer/media/media_stream_dispatcher_unittest.cc', |
| 572 'renderer/media/media_stream_impl_unittest.cc', | 572 'renderer/media/media_stream_impl_unittest.cc', |
| 573 'renderer/media/rtc_peer_connection_handler_unittest.cc', | 573 'renderer/media/rtc_peer_connection_handler_unittest.cc', |
| 574 'renderer/media/webrtc_audio_device_unittest.cc', | 574 'renderer/media/webrtc_audio_device_unittest.cc', |
| 575 ], | 575 ], |
| 576 'dependencies': [ | 576 'dependencies': [ |
| 577 '../third_party/libjingle/libjingle.gyp:libpeerconnection', | 577 '../third_party/libjingle/libjingle.gyp:libpeerconnection', |
| 578 '../third_party/webrtc/modules/modules.gyp:video_capture_module', | 578 '../third_party/webrtc/modules/modules.gyp:video_capture_module', |
| 579 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co
re', |
| 579 ] | 580 ] |
| 580 }], | 581 }], |
| 581 # TODO(jrg): remove the OS=="android" section? | 582 # TODO(jrg): remove the OS=="android" section? |
| 582 # http://crbug.com/113172 | 583 # http://crbug.com/113172 |
| 583 # Understand better how media_stream_ is tied into Chromium. | 584 # Understand better how media_stream_ is tied into Chromium. |
| 584 ['enable_webrtc==0 and OS=="android"', { | 585 ['enable_webrtc==0 and OS=="android"', { |
| 585 'sources/': [ | 586 'sources/': [ |
| 586 ['exclude', '^renderer/media/media_stream_'], | 587 ['exclude', '^renderer/media/media_stream_'], |
| 587 ], | 588 ], |
| 588 }], | 589 }], |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 'additional_src_dirs': ['../content/public/android/javatests/',], | 1060 'additional_src_dirs': ['../content/public/android/javatests/',], |
| 1060 'resource_dir': '../shell_apk/res', | 1061 'resource_dir': '../shell_apk/res', |
| 1061 'is_test_apk': 1, | 1062 'is_test_apk': 1, |
| 1062 }, | 1063 }, |
| 1063 'includes': [ '../build/java_apk.gypi' ], | 1064 'includes': [ '../build/java_apk.gypi' ], |
| 1064 }, | 1065 }, |
| 1065 ], | 1066 ], |
| 1066 }], | 1067 }], |
| 1067 ], | 1068 ], |
| 1068 } | 1069 } |
| OLD | NEW |