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

Unified 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: Fixing mac build. 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 side-by-side diff with in-line comments
Download patch
Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 0eaf86c3594f29dbf924728aae7db5ed24dc28cb..13d802b72029a08d930c04cf645eed099478b789 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -574,9 +574,9 @@
],
},
{
- # GN version: //third_party/libjingle:libpeerconnection
- 'target_name': 'libpeerconnection',
- 'type': '<(libpeer_target_type)',
+ # GN version: //third_party/libjingle:libpeerconnection (shared with ':libpeerconnection')
+ 'target_name': 'libjingle_mediaengine',
+ 'type': 'static_library',
'sources': [
# Note: sources list duplicated in GN build.
'<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
@@ -589,13 +589,27 @@
'<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
],
'dependencies': [
- '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+ 'libjingle_webrtc_common',
'<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
'<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
+ ],
+ },
+ {
+ # GN version: //third_party/libjingle:libpeerconnection
+ 'target_name': 'libpeerconnection',
+ 'type': '<(libpeer_target_type)',
+ 'dependencies': [
+ '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
'<@(libjingle_peerconnection_additional_deps)',
- 'libjingle_webrtc_common',
+ 'libjingle_mediaengine',
],
'conditions': [
+ ['libpeer_target_type=="static_library" and OS=="mac"', {
+ # TODO(serya): Termpraty workaround for crbug.com/418915. Remove when fixed.
kjellander_chromium 2014/10/01 18:44:10 nit: Termpraty -> Temporary.
SeRya 2014/10/01 21:05:16 Done.
+ 'sources': [
+ 'overrides/empty.cc',
+ ]
+ }],
['libpeer_target_type!="static_library"', {
'sources': [
'overrides/initialize_module.cc',
@@ -646,5 +660,38 @@
}, # target libpeerconnection
],
}],
+ ['enable_webrtc==1 and OS=="android"', {
+ 'targets': [
+ {
+ # GN version: //third_party/libjingle:libjingle_peerconnection_so
+ 'target_name': 'libjingle_peerconnection_so',
+ 'type': 'shared_library',
+ 'dependencies': [
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:field_trial_default',
+ 'libjingle_mediaengine',
+ ],
+ 'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
+ 'sources': [
+ '<(libjingle_source)/talk/app/webrtc/java/jni/peerconnection_jni.cc',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)/third_party/libyuv/include',
kjellander_chromium 2014/10/01 18:44:10 Is this really needed?
SeRya 2014/10/01 21:05:16 Done.
+ ],
+ },
+ {
+ # GN version: //third_party/libjingle:libjingle_peerconnection_java
+ 'target_name': 'libjingle_peerconnection_javalib',
+ 'type': 'none',
+ 'variables': {
+ 'java_in_dir': '<(libjingle_source)/talk/app/webrtc/java',
+ },
+ 'dependencies': [
+ 'libjingle_peerconnection_so',
+ ],
+ 'includes': [ '../../build/java.gypi' ],
+ },
+ ],
+ }],
],
}

Powered by Google App Engine
This is Rietveld 408576698