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

Side by Side Diff: talk/libjingle.gyp

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 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
OLDNEW
1 # 1 #
2 # libjingle 2 # libjingle
3 # Copyright 2012 Google Inc. 3 # Copyright 2012 Google Inc.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are met: 6 # modification, are permitted provided that the following conditions are met:
7 # 7 #
8 # 1. Redistributions of source code must retain the above copyright notice, 8 # 1. Redistributions of source code must retain the above copyright notice,
9 # this list of conditions and the following disclaimer. 9 # this list of conditions and the following disclaimer.
10 # 2. Redistributions in binary form must reproduce the above copyright notice, 10 # 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 28 matching lines...) Expand all
39 }, 39 },
40 }], 40 }],
41 ], 41 ],
42 }], 42 }],
43 ['OS=="linux" or OS=="android"', { 43 ['OS=="linux" or OS=="android"', {
44 'targets': [ 44 'targets': [
45 { 45 {
46 'target_name': 'libjingle_peerconnection_so', 46 'target_name': 'libjingle_peerconnection_so',
47 'type': 'shared_library', 47 'type': 'shared_library',
48 'dependencies': [ 48 'dependencies': [
49 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_defa ult',
49 'libjingle_peerconnection', 50 'libjingle_peerconnection',
50 ], 51 ],
51 'sources': [ 52 'sources': [
52 'app/webrtc/java/jni/classreferenceholder.cc', 53 'app/webrtc/java/jni/classreferenceholder.cc',
53 'app/webrtc/java/jni/classreferenceholder.h', 54 'app/webrtc/java/jni/classreferenceholder.h',
54 'app/webrtc/java/jni/jni_helpers.cc', 55 'app/webrtc/java/jni/jni_helpers.cc',
55 'app/webrtc/java/jni/jni_helpers.h', 56 'app/webrtc/java/jni/jni_helpers.h',
56 'app/webrtc/java/jni/native_handle_impl.cc', 57 'app/webrtc/java/jni/native_handle_impl.cc',
57 'app/webrtc/java/jni/native_handle_impl.h', 58 'app/webrtc/java/jni/native_handle_impl.h',
58 'app/webrtc/java/jni/peerconnection_jni.cc', 59 'app/webrtc/java/jni/peerconnection_jni.cc',
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 }, # target libjingle 426 }, # target libjingle
426 { 427 {
427 'target_name': 'libjingle_media', 428 'target_name': 'libjingle_media',
428 'type': 'static_library', 429 'type': 'static_library',
429 'dependencies': [ 430 'dependencies': [
430 '<(webrtc_root)/common.gyp:webrtc_common', 431 '<(webrtc_root)/common.gyp:webrtc_common',
431 '<(webrtc_root)/modules/modules.gyp:video_render_module', 432 '<(webrtc_root)/modules/modules.gyp:video_render_module',
432 '<(webrtc_root)/webrtc.gyp:webrtc', 433 '<(webrtc_root)/webrtc.gyp:webrtc',
433 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine', 434 '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
434 '<(webrtc_root)/sound/sound.gyp:rtc_sound', 435 '<(webrtc_root)/sound/sound.gyp:rtc_sound',
436 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
435 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers', 437 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
436 '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_defa ult',
437 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', 438 '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
438 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', 439 '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
439 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p', 440 '<(webrtc_root)/p2p/p2p.gyp:rtc_p2p',
440 'libjingle', 441 'libjingle',
441 ], 442 ],
442 'direct_dependent_settings': { 443 'direct_dependent_settings': {
443 'include_dirs': [ 444 'include_dirs': [
444 '<(libyuv_dir)/include', 445 '<(libyuv_dir)/include',
445 ], 446 ],
446 }, 447 },
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 ['OS=="android" and build_with_chromium==0', { 789 ['OS=="android" and build_with_chromium==0', {
789 'sources': [ 790 'sources': [
790 'app/webrtc/androidvideocapturer.h', 791 'app/webrtc/androidvideocapturer.h',
791 'app/webrtc/androidvideocapturer.cc', 792 'app/webrtc/androidvideocapturer.cc',
792 ], 793 ],
793 }], 794 }],
794 ], 795 ],
795 }, # target libjingle_peerconnection 796 }, # target libjingle_peerconnection
796 ], 797 ],
797 } 798 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698