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

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

Issue 551793003: Making WebRTC Java api avaliable in Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « third_party/libjingle/BUILD.gn ('k') | third_party/libjingle/libjingle_peerconnection.gypi » ('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 '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 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
591 'overrides/init_webrtc.h', 591 'overrides/init_webrtc.h',
592 ], 592 ],
593 'dependencies': [ 593 'dependencies': [
594 'libjingle_webrtc_common', 594 'libjingle_webrtc_common',
595 ], 595 ],
596 }, 596 },
597 { 597 {
598 # GN version: //third_party/libjingle:libpeerconnection 598 # GN version: //third_party/libjingle:libpeerconnection
599 'target_name': 'libpeerconnection', 599 'target_name': 'libpeerconnection',
600 'type': '<(libpeer_target_type)', 600 'type': '<(libpeer_target_type)',
601 'sources': [ 601 'includes': [ 'libjingle_peerconnection.gypi' ],
602 # Note: sources list duplicated in GN build.
603 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
604 '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
605 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
606 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
607 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
608 '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h',
609 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
610 '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
611 ],
612 'dependencies': [
613 '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers. gyp:system_wrappers',
614 '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_eng ine',
615 '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
616 '<@(libjingle_peerconnection_additional_deps)',
617 'libjingle_webrtc_common',
618 ],
619 'conditions': [ 602 'conditions': [
620 ['libpeer_target_type!="static_library"', { 603 ['libpeer_target_type!="static_library"', {
621 'sources': [ 604 'sources': [
622 'overrides/initialize_module.cc', 605 'overrides/initialize_module.cc',
623 ], 606 ],
624 'conditions': [ 607 'conditions': [
625 ['OS!="mac" and OS!="android"', { 608 ['OS!="mac" and OS!="android"', {
626 'sources': [ 609 'sources': [
627 'overrides/allocator_shim/allocator_proxy.cc', 610 'overrides/allocator_shim/allocator_proxy.cc',
628 ], 611 ],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 ['OS=="linux" and libpeer_target_type!="static_library"', { 643 ['OS=="linux" and libpeer_target_type!="static_library"', {
661 # The installer and various tools depend on finding the .so 644 # The installer and various tools depend on finding the .so
662 # in this directory and not lib.target as will otherwise be 645 # in this directory and not lib.target as will otherwise be
663 # the case with make builds. 646 # the case with make builds.
664 'product_dir': '<(PRODUCT_DIR)/lib', 647 'product_dir': '<(PRODUCT_DIR)/lib',
665 }], 648 }],
666 ], 649 ],
667 }, # target libpeerconnection 650 }, # target libpeerconnection
668 ], 651 ],
669 }], 652 }],
653 ['enable_webrtc==1 and OS=="android"', {
654 'targets': [
655 {
656 # GN version: //third_party/libjingle:libjingle_peerconnection_so
657 'target_name': 'libjingle_peerconnection_so',
658 'type': 'loadable_module',
659 'dependencies': [
660 'libjingle_webrtc_common',
hellner1 2014/09/29 18:21:05 Do you need "init_webrtc.cc/h" if you instead depe
SeRya 2014/09/30 18:29:01 Reason for this was webrtc::field_trial::FindFullN
661 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
662 ],
663 'includes': [ 'libjingle_peerconnection.gypi' ],
664 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
665 'sources': [
666 '<(libjingle_source)/talk/app/webrtc/java/jni/peerconnection_jni.cc' ,
667 'overrides/init_webrtc.cc',
668 'overrides/init_webrtc.h',
669 ],
670 'include_dirs': [
671 '<(DEPTH)/third_party/libyuv/include',
672 ],
673 },
674 {
675 # GN version: //third_party/libjingle:libjingle_peerconnection_java
676 'target_name': 'libjingle_peerconnection_javalib',
677 'type': 'none',
678 'variables': {
679 'java_in_dir': '<(libjingle_source)/talk/app/webrtc/java',
680 },
681 'dependencies': [
682 'libjingle_peerconnection_so',
683 ],
684 'includes': [ '../../build/java.gypi' ],
hellner1 2014/09/29 18:21:05 This might make it harder get rid of this duplicat
SeRya 2014/09/30 18:29:01 Do you have an idea how to make it easier? It seem
685 },
686 ],
687 }],
670 ], 688 ],
671 } 689 }
OLDNEW
« no previous file with comments | « third_party/libjingle/BUILD.gn ('k') | third_party/libjingle/libjingle_peerconnection.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698