Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(442)

Side by Side Diff: trunk/src/content/content_tests.gypi

Issue 12662028: Revert 189802 "Refactor libjingle and libpeerconnection targets." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/chrome/chrome_browser.gypi ('k') | trunk/src/third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 'browser/renderer_host/p2p/socket_host_udp_unittest.cc', 566 'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
567 'renderer/media/media_stream_dependency_factory_unittest.cc', 567 'renderer/media/media_stream_dependency_factory_unittest.cc',
568 'renderer/media/media_stream_dispatcher_unittest.cc', 568 'renderer/media/media_stream_dispatcher_unittest.cc',
569 'renderer/media/media_stream_impl_unittest.cc', 569 'renderer/media/media_stream_impl_unittest.cc',
570 'renderer/media/rtc_peer_connection_handler_unittest.cc', 570 'renderer/media/rtc_peer_connection_handler_unittest.cc',
571 'renderer/media/webrtc_audio_device_unittest.cc', 571 'renderer/media/webrtc_audio_device_unittest.cc',
572 ], 572 ],
573 'dependencies': [ 573 'dependencies': [
574 '../third_party/libjingle/libjingle.gyp:libpeerconnection', 574 '../third_party/libjingle/libjingle.gyp:libpeerconnection',
575 '../third_party/webrtc/modules/modules.gyp:video_capture_module', 575 '../third_party/webrtc/modules/modules.gyp:video_capture_module',
576 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_co re',
577 ] 576 ]
578 }], 577 }],
579 # TODO(jrg): remove the OS=="android" section? 578 # TODO(jrg): remove the OS=="android" section?
580 # http://crbug.com/113172 579 # http://crbug.com/113172
581 # Understand better how media_stream_ is tied into Chromium. 580 # Understand better how media_stream_ is tied into Chromium.
582 ['enable_webrtc==0 and OS=="android"', { 581 ['enable_webrtc==0 and OS=="android"', {
583 'sources/': [ 582 'sources/': [
584 ['exclude', '^renderer/media/media_stream_'], 583 ['exclude', '^renderer/media/media_stream_'],
585 ], 584 ],
586 }], 585 }],
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 'additional_src_dirs': ['../content/public/android/javatests/',], 1056 'additional_src_dirs': ['../content/public/android/javatests/',],
1058 'resource_dir': '../shell_apk/res', 1057 'resource_dir': '../shell_apk/res',
1059 'is_test_apk': 1, 1058 'is_test_apk': 1,
1060 }, 1059 },
1061 'includes': [ '../build/java_apk.gypi' ], 1060 'includes': [ '../build/java_apk.gypi' ],
1062 }, 1061 },
1063 ], 1062 ],
1064 }], 1063 }],
1065 ], 1064 ],
1066 } 1065 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_browser.gypi ('k') | trunk/src/third_party/libjingle/libjingle.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698