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

Side by Side Diff: third_party/libjingle/libjingle.gyp

Issue 475683002: roll webrtc 6825-6898 and add some missing files to libjingle gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding pbos@ added files Created 6 years, 4 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 | « third_party/libjingle/README.chromium ('k') | no next file » | 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 'includes': [ 6 'includes': [
7 '../../build/win_precompile.gypi', 7 '../../build/win_precompile.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'enabled_libjingle_device_manager%': 0, 10 'enabled_libjingle_device_manager%': 0,
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 'libjingle_webrtc_common', 581 'libjingle_webrtc_common',
582 ], 582 ],
583 }, 583 },
584 { 584 {
585 'target_name': 'libpeerconnection', 585 'target_name': 'libpeerconnection',
586 'type': '<(libpeer_target_type)', 586 'type': '<(libpeer_target_type)',
587 'sources': [ 587 'sources': [
588 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc', 588 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
589 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h', 589 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
590 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc', 590 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
591 '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.cc',
592 '<(libjingle_source)/talk/media/webrtc/webrtcvideoframefactory.h',
591 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h', 593 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
592 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc', 594 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
593 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h', 595 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h',
594 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc', 596 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
595 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h', 597 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
596 ], 598 ],
597 'dependencies': [ 599 'dependencies': [
598 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers', 600 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
599 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine', 601 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine',
600 '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc', 602 '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 # in this directory and not lib.target as will otherwise be 649 # in this directory and not lib.target as will otherwise be
648 # the case with make builds. 650 # the case with make builds.
649 'product_dir': '<(PRODUCT_DIR)/lib', 651 'product_dir': '<(PRODUCT_DIR)/lib',
650 }], 652 }],
651 ], 653 ],
652 }, # target libpeerconnection 654 }, # target libpeerconnection
653 ], 655 ],
654 }], 656 }],
655 ], 657 ],
656 } 658 }
OLDNEW
« no previous file with comments | « third_party/libjingle/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698