Index: talk/libjingle.gyp |
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp |
index afde2fa992d2082136ae383452259271ae217fc2..5054667b2d6aa13480c507726ec657f04781a386 100755 |
--- a/talk/libjingle.gyp |
+++ b/talk/libjingle.gyp |
@@ -43,8 +43,8 @@ |
['OS=="linux" or OS=="android"', { |
'targets': [ |
{ |
- 'target_name': 'libjingle_peerconnection_so', |
- 'type': 'shared_library', |
+ 'target_name': 'libjingle_peerconnection_jni', |
+ 'type': 'static_library', |
'dependencies': [ |
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default', |
'libjingle_peerconnection', |
@@ -63,37 +63,23 @@ |
], |
'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)', |
- ], |
- }, |
- }], |
- ], |
}], |
- ['OS=="android"', { |
- 'sources': [ |
- 'app/webrtc/java/jni/androidvideocapturer_jni.cc', |
- 'app/webrtc/java/jni/androidvideocapturer_jni.h', |
+ ['build_json==1', { |
+ 'dependencies': [ |
+ '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', |
+ ], |
+ 'export_dependent_settings': [ |
+ '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', |
], |
- 'variables': { |
- # This library uses native JNI exports; tell GYP so that the |
- # required symbols will be kept. |
- 'use_native_jni_exports': 1, |
- }, |
}], |
- ['OS=="android" and build_with_chromium==0', { |
+ ['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', |
@@ -101,6 +87,8 @@ |
'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', |
] |
@@ -108,6 +96,43 @@ |
], |
}, |
{ |
+ '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': [ |
@@ -792,14 +817,6 @@ |
'app/webrtc/webrtcsessiondescriptionfactory.cc', |
'app/webrtc/webrtcsessiondescriptionfactory.h', |
], |
- 'conditions': [ |
- ['OS=="android" and build_with_chromium==0', { |
- 'sources': [ |
- 'app/webrtc/androidvideocapturer.h', |
- 'app/webrtc/androidvideocapturer.cc', |
- ], |
- }], |
- ], |
}, # target libjingle_peerconnection |
], |
} |