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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: talk/libjingle.gyp

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated location for peerconnection_unittests.isolate Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/build/common.gypi ('k') | talk/libjingle_tests.gyp » ('j') | webrtc/api/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/libjingle.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index 17fe497385123118ecdb54cbd8290f05ba3469c8..c7ee635bd71d38c460bb1d8410f65a7653ddb0ca 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -27,253 +27,6 @@
{
'includes': ['build/common.gypi'],
'conditions': [
- ['os_posix == 1 and OS != "mac" and OS != "ios"', {
- 'conditions': [
- ['sysroot!=""', {
- 'variables': {
- 'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
- },
- }, {
- 'variables': {
- 'pkg-config': 'pkg-config'
- },
- }],
- ],
- }],
- ['OS=="linux" or OS=="android"', {
- 'targets': [
- {
- 'target_name': 'libjingle_peerconnection_jni',
- 'type': 'static_library',
- 'dependencies': [
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
- 'libjingle_peerconnection',
- ],
- 'sources': [
- 'app/webrtc/java/jni/classreferenceholder.cc',
- 'app/webrtc/java/jni/classreferenceholder.h',
- 'app/webrtc/java/jni/jni_helpers.cc',
- 'app/webrtc/java/jni/jni_helpers.h',
- 'app/webrtc/java/jni/native_handle_impl.cc',
- 'app/webrtc/java/jni/native_handle_impl.h',
- 'app/webrtc/java/jni/peerconnection_jni.cc',
- ],
- 'include_dirs': [
- '<(libyuv_dir)/include',
- ],
- 'conditions': [
- ['OS=="linux"', {
- 'include_dirs': [
- '<(java_home)/include',
- '<(java_home)/include/linux',
- ],
- }],
- ['build_json==1', {
- 'dependencies': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- 'export_dependent_settings': [
- '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
- ],
- }],
- ['OS=="android"', {
- 'sources': [
- 'app/webrtc/androidvideocapturer.cc',
- 'app/webrtc/androidvideocapturer.h',
- 'app/webrtc/java/jni/androidmediacodeccommon.h',
- 'app/webrtc/java/jni/androidmediadecoder_jni.cc',
- 'app/webrtc/java/jni/androidmediadecoder_jni.h',
- 'app/webrtc/java/jni/androidmediaencoder_jni.cc',
- 'app/webrtc/java/jni/androidmediaencoder_jni.h',
- 'app/webrtc/java/jni/androidnetworkmonitor_jni.cc',
- 'app/webrtc/java/jni/androidnetworkmonitor_jni.h',
- 'app/webrtc/java/jni/androidvideocapturer_jni.cc',
- 'app/webrtc/java/jni/androidvideocapturer_jni.h',
- 'app/webrtc/java/jni/surfacetexturehelper_jni.cc',
- 'app/webrtc/java/jni/surfacetexturehelper_jni.h',
- ]
- }],
- ],
- },
- {
- 'target_name': 'libjingle_peerconnection_so',
- 'type': 'shared_library',
- 'dependencies': [
- 'libjingle_peerconnection',
- 'libjingle_peerconnection_jni',
- ],
- 'sources': [
- 'app/webrtc/java/jni/jni_onload.cc',
- ],
- 'variables': {
- # This library uses native JNI exports; tell GYP so that the
- # required symbols will be kept.
- 'use_native_jni_exports': 1,
- },
- 'conditions': [
- ['OS=="linux"', {
- 'defines': [
- 'HAVE_GTK',
- ],
- 'include_dirs': [
- '<(java_home)/include',
- '<(java_home)/include/linux',
- ],
- 'conditions': [
- ['use_gtk==1', {
- 'link_settings': {
- 'libraries': [
- '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
- ' gtk+-2.0)',
- ],
- },
- }],
- ],
- }],
- ],
- },
- {
- 'target_name': 'libjingle_peerconnection_jar',
- 'type': 'none',
- 'actions': [
- {
- # TODO(jiayl): extract peerconnection_java_files and android_java_files into a webrtc
- # gyp var that can be included here, or better yet, build a proper .jar in webrtc
- # and include it here.
- 'variables': {
- 'java_src_dir': 'app/webrtc/java/src',
- 'webrtc_base_dir': '<(webrtc_root)/base',
- 'webrtc_modules_dir': '<(webrtc_root)/modules',
- 'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log',
- 'peerconnection_java_files': [
- 'app/webrtc/java/src/org/webrtc/AudioSource.java',
- 'app/webrtc/java/src/org/webrtc/AudioTrack.java',
- 'app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java',
- 'app/webrtc/java/src/org/webrtc/DataChannel.java',
- 'app/webrtc/java/src/org/webrtc/IceCandidate.java',
- 'app/webrtc/java/src/org/webrtc/MediaConstraints.java',
- 'app/webrtc/java/src/org/webrtc/MediaSource.java',
- 'app/webrtc/java/src/org/webrtc/MediaStream.java',
- 'app/webrtc/java/src/org/webrtc/MediaStreamTrack.java',
- 'app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java',
- 'app/webrtc/java/src/org/webrtc/PeerConnection.java',
- 'app/webrtc/java/src/org/webrtc/RtpReceiver.java',
- 'app/webrtc/java/src/org/webrtc/RtpSender.java',
- 'app/webrtc/java/src/org/webrtc/SdpObserver.java',
- 'app/webrtc/java/src/org/webrtc/StatsObserver.java',
- 'app/webrtc/java/src/org/webrtc/StatsReport.java',
- 'app/webrtc/java/src/org/webrtc/SessionDescription.java',
- 'app/webrtc/java/src/org/webrtc/VideoCapturer.java',
- 'app/webrtc/java/src/org/webrtc/VideoRenderer.java',
- 'app/webrtc/java/src/org/webrtc/VideoSource.java',
- 'app/webrtc/java/src/org/webrtc/VideoTrack.java',
- '<(webrtc_base_dir)/java/src/org/webrtc/Logging.java',
- ],
- 'android_java_files': [
- 'app/webrtc/java/android/org/webrtc/Camera2Enumerator.java',
- 'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java',
- 'app/webrtc/java/android/org/webrtc/CameraEnumerator.java',
- 'app/webrtc/java/android/org/webrtc/EglBase.java',
- 'app/webrtc/java/android/org/webrtc/EglBase10.java',
- 'app/webrtc/java/android/org/webrtc/EglBase14.java',
- 'app/webrtc/java/android/org/webrtc/GlRectDrawer.java',
- 'app/webrtc/java/android/org/webrtc/GlShader.java',
- 'app/webrtc/java/android/org/webrtc/GlUtil.java',
- 'app/webrtc/java/android/org/webrtc/GlTextureFrameBuffer.java',
- 'app/webrtc/java/android/org/webrtc/NetworkMonitor.java',
- 'app/webrtc/java/android/org/webrtc/NetworkMonitorAutoDetect.java',
- 'app/webrtc/java/android/org/webrtc/RendererCommon.java',
- 'app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java',
- 'app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java',
- 'app/webrtc/java/android/org/webrtc/ThreadUtils.java',
- 'app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java',
- 'app/webrtc/java/android/org/webrtc/VideoRendererGui.java',
- 'app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java',
- 'app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java',
- '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java',
- '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java',
- '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java',
- '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java',
- ],
- },
- 'action_name': 'create_jar',
- 'inputs': [
- 'build/build_jar.sh',
- '<@(java_files)',
- ],
- 'outputs': [
- '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
- ],
- 'conditions': [
- ['OS=="android"', {
- 'variables': {
- 'java_files': ['<@(peerconnection_java_files)', '<@(android_java_files)'],
- 'build_classpath': '<(java_src_dir):<(DEPTH)/third_party/android_tools/sdk/platforms/android-<(android_sdk_version)/android.jar',
- },
- }, {
- 'variables': {
- 'java_files': ['<@(peerconnection_java_files)'],
- 'build_classpath': '<(java_src_dir)',
- },
- }],
- ],
- 'action': [
- 'bash', '-ec',
- 'mkdir -p <(INTERMEDIATE_DIR) && '
- '{ build/build_jar.sh <(java_home) <@(_outputs) '
- ' <(INTERMEDIATE_DIR)/build_jar.tmp '
- ' <(build_classpath) <@(java_files) '
- ' > <(build_jar_log) 2>&1 || '
- ' { cat <(build_jar_log) ; exit 1; } }'
- ],
- },
- ],
- 'dependencies': [
- 'libjingle_peerconnection_so',
- ],
- },
- ],
- }],
- ['OS=="android"', {
- 'targets': [
- {
- # |libjingle_peerconnection_java| builds a jar file with name
- # libjingle_peerconnection_java.jar using Chromes build system.
- # It includes all Java files needed to setup a PeeerConnection call
- # from Android.
- # TODO(perkj): Consider replacing the use of
- # libjingle_peerconnection_jar with this target everywhere.
- 'target_name': 'libjingle_peerconnection_java',
- 'type': 'none',
- 'dependencies': [
- 'libjingle_peerconnection_so',
- ],
- 'variables': {
- # Designate as Chromium code and point to our lint settings to
- # enable linting of the WebRTC code (this is the only way to make
- # lint_action invoke the Android linter).
- 'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
- 'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
- 'chromium_code': 1,
- 'java_in_dir': 'app/webrtc/java',
- 'webrtc_base_dir': '<(webrtc_root)/base',
- 'webrtc_modules_dir': '<(webrtc_root)/modules',
- 'additional_src_dirs' : [
- 'app/webrtc/java/android',
- '<(webrtc_base_dir)/java/src',
- '<(webrtc_modules_dir)/audio_device/android/java/src',
- '<(webrtc_modules_dir)/video_render/android/java/src',
- ],
- },
- 'includes': ['../build/java.gypi'],
- }, # libjingle_peerconnection_java
- ]
- }],
['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
# The >= 10.7 above is required for ARC.
pthatcher1 2016/02/05 21:18:49 Shouldn't we (re)move this target also? I thought
kjellander_webrtc 2016/02/08 09:12:06 No, Zeke wanted to let the ObjC files stay, since
'targets': [
@@ -281,7 +34,7 @@
'target_name': 'libjingle_peerconnection_objc',
'type': 'static_library',
'dependencies': [
- 'libjingle_peerconnection',
+ '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
],
'sources': [
'app/webrtc/objc/RTCAudioTrack+Internal.h',
@@ -363,7 +116,7 @@
],
},
'include_dirs': [
- '<(DEPTH)/talk/app/webrtc',
+ '<(webrtc_root)/webrtc/api',
'<(DEPTH)/talk/app/webrtc/objc',
'<(DEPTH)/talk/app/webrtc/objc/public',
],
@@ -435,7 +188,6 @@
],
}],
],
-
'targets': [
{
'target_name': 'libjingle',
@@ -748,86 +500,5 @@
'session/media/voicechannel.h',
],
}, # target libjingle_p2p
- {
- 'target_name': 'libjingle_peerconnection',
- 'type': 'static_library',
- 'dependencies': [
- 'libjingle',
- 'libjingle_media',
- 'libjingle_p2p',
- ],
- 'sources': [
- 'app/webrtc/audiotrack.cc',
- 'app/webrtc/audiotrack.h',
- 'app/webrtc/datachannel.cc',
- 'app/webrtc/datachannel.h',
- 'app/webrtc/datachannelinterface.h',
- 'app/webrtc/dtlsidentitystore.cc',
- 'app/webrtc/dtlsidentitystore.h',
- 'app/webrtc/dtmfsender.cc',
- 'app/webrtc/dtmfsender.h',
- 'app/webrtc/dtmfsenderinterface.h',
- 'app/webrtc/jsep.h',
- 'app/webrtc/jsepicecandidate.cc',
- 'app/webrtc/jsepicecandidate.h',
- 'app/webrtc/jsepsessiondescription.cc',
- 'app/webrtc/jsepsessiondescription.h',
- 'app/webrtc/localaudiosource.cc',
- 'app/webrtc/localaudiosource.h',
- 'app/webrtc/mediaconstraintsinterface.cc',
- 'app/webrtc/mediaconstraintsinterface.h',
- 'app/webrtc/mediacontroller.cc',
- 'app/webrtc/mediacontroller.h',
- 'app/webrtc/mediastream.cc',
- 'app/webrtc/mediastream.h',
- 'app/webrtc/mediastreaminterface.h',
- 'app/webrtc/mediastreamobserver.cc',
- 'app/webrtc/mediastreamobserver.h',
- 'app/webrtc/mediastreamprovider.h',
- 'app/webrtc/mediastreamproxy.h',
- 'app/webrtc/mediastreamtrack.h',
- 'app/webrtc/mediastreamtrackproxy.h',
- 'app/webrtc/notifier.h',
- 'app/webrtc/peerconnection.cc',
- 'app/webrtc/peerconnection.h',
- 'app/webrtc/peerconnectionfactory.cc',
- 'app/webrtc/peerconnectionfactory.h',
- 'app/webrtc/peerconnectionfactoryproxy.h',
- 'app/webrtc/peerconnectioninterface.h',
- 'app/webrtc/peerconnectionproxy.h',
- 'app/webrtc/proxy.h',
- 'app/webrtc/remoteaudiosource.cc',
- 'app/webrtc/remoteaudiosource.h',
- 'app/webrtc/remotevideocapturer.cc',
- 'app/webrtc/remotevideocapturer.h',
- 'app/webrtc/rtpreceiver.cc',
- 'app/webrtc/rtpreceiver.h',
- 'app/webrtc/rtpreceiverinterface.h',
- 'app/webrtc/rtpsender.cc',
- 'app/webrtc/rtpsender.h',
- 'app/webrtc/rtpsenderinterface.h',
- 'app/webrtc/sctputils.cc',
- 'app/webrtc/sctputils.h',
- 'app/webrtc/statscollector.cc',
- 'app/webrtc/statscollector.h',
- 'app/webrtc/statstypes.cc',
- 'app/webrtc/statstypes.h',
- 'app/webrtc/streamcollection.h',
- 'app/webrtc/videosource.cc',
- 'app/webrtc/videosource.h',
- 'app/webrtc/videosourceinterface.h',
- 'app/webrtc/videosourceproxy.h',
- 'app/webrtc/videotrack.cc',
- 'app/webrtc/videotrack.h',
- 'app/webrtc/videotrackrenderers.cc',
- 'app/webrtc/videotrackrenderers.h',
- 'app/webrtc/webrtcsdp.cc',
- 'app/webrtc/webrtcsdp.h',
- 'app/webrtc/webrtcsession.cc',
- 'app/webrtc/webrtcsession.h',
- 'app/webrtc/webrtcsessiondescriptionfactory.cc',
- 'app/webrtc/webrtcsessiondescriptionfactory.h',
- ],
- }, # target libjingle_peerconnection
],
}
« no previous file with comments | « talk/build/common.gypi ('k') | talk/libjingle_tests.gyp » ('j') | webrtc/api/OWNERS » ('J')

Powered by Google App Engine
This is Rietveld 408576698