zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GYP variables for building expat, icu, libsrtp, usrsctp

Browse Source 
This makes the build more flexible when linking against
prebuilt external libraries.

Use existing build_* variables for libyuv and json in talk/
(already in use in webrtc/).

Also make it possible to avoid building the GTK parts of the Linux build.

BUG=4242
R=andrew@webrtc.org, tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/44179005

Cr-Commit-Position: refs/heads/master@{#9087}
This commit is contained in:
Henrik Kjellander
2015-04-27 14:39:04 +02:00
parent 61be2a4016
commit e6cefb60f8
13 changed files with 162 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
talk/app/webrtc/java/jni/jni_helpers.cc
View File

@ -103,7 +103,7 @@ jint InitGlobalJniVariables(JavaVM *jvm) {
// Return thread ID as a string. // Return thread ID as a string.
static std::string GetThreadId() { static std::string GetThreadId() {
char buf[21]; // Big enough to hold a kuint64max plus terminating NULL. char buf[21]; // Big enough to hold a kuint64max plus terminating NULL.
CHECK_LT(snprintf(buf, sizeof(buf), "%llu", syscall(__NR_gettid)), CHECK_LT(snprintf(buf, sizeof(buf), "%ld", syscall(__NR_gettid)),
sizeof(buf)) sizeof(buf))
<< "Thread id is bigger than uint64??"; << "Thread id is bigger than uint64??";
return std::string(buf); return std::string(buf);

12
talk/build/common.gypi
View File

@ -40,6 +40,18 @@
'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")', 'java_home%': '<!(python -c "import os; dir=os.getenv(\'JAVA_HOME\', \'/usr/lib/jvm/java-7-openjdk-amd64\'); assert os.path.exists(os.path.join(dir, \'include/jni.h\')), \'Point \\$JAVA_HOME or the java_home gyp variable to a directory containing include/jni.h!\'; print dir")',
}], }],
], ],
# Disable these to not build components which can be externally provided.
'build_expat%': 1,
'build_icu%': 1,
'build_json%': 1,
'build_libsrtp%': 1,
'build_libyuv%': 1,
'build_usrsctp%': 1,
# Make it possible to provide custom locations for some libraries.
'libyuv_dir%': '<(DEPTH)/third_party/libyuv',
# Disable this to skip building source requiring GTK.
'use_gtk%': 1,
}, },
'target_defaults': { 'target_defaults': {
'include_dirs': [ 'include_dirs': [

74
talk/libjingle.gyp
View File

@ -47,7 +47,6 @@
'type': 'shared_library', 'type': 'shared_library',
'dependencies': [ 'dependencies': [
'libjingle_peerconnection', 'libjingle_peerconnection',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
], ],
'sources': [ 'sources': [
'app/webrtc/java/jni/classreferenceholder.cc', 'app/webrtc/java/jni/classreferenceholder.cc',
@ -58,9 +57,14 @@
'app/webrtc/java/jni/peerconnection_jni.cc', 'app/webrtc/java/jni/peerconnection_jni.cc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/libyuv/include', '<(libyuv_dir)/include',
], ],
'conditions': [ 'conditions': [
['build_icu==1', {
'dependencies': [
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
],
}],
['OS=="linux"', { ['OS=="linux"', {
'defines': [ 'defines': [
'HAVE_GTK', 'HAVE_GTK',
@ -69,6 +73,8 @@
'<(java_home)/include', '<(java_home)/include',
'<(java_home)/include/linux', '<(java_home)/include/linux',
], ],
'conditions': [
['use_gtk==1', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0' '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
@ -76,6 +82,8 @@
], ],
}, },
}], }],
],
}],
['OS=="android"', { ['OS=="android"', {
'sources': [ 'sources': [
'app/webrtc/java/jni/androidvideocapturer_jni.cc', 'app/webrtc/java/jni/androidvideocapturer_jni.cc',
@ -358,26 +366,31 @@
'target_name': 'libjingle', 'target_name': 'libjingle',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
], ],
'conditions': [
['build_json==1', {
'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
}],
['build_expat==1', {
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'export_dependent_settings': [ 'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', ],
}],
], ],
}, # target libjingle }, # target libjingle
{ {
'target_name': 'libjingle_media', 'target_name': 'libjingle_media',
'type': 'static_library', 'type': 'static_library',
'include_dirs': [
# TODO(jiayl): move this into the direct_dependent_settings of
# usrsctp.gyp.
'<(DEPTH)/third_party/usrsctp',
],
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
'<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/modules/modules.gyp:video_render_module', '<(webrtc_root)/modules/modules.gyp:video_render_module',
'<(webrtc_root)/webrtc.gyp:webrtc', '<(webrtc_root)/webrtc.gyp:webrtc',
@ -392,7 +405,7 @@
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/libyuv/include', '<(libyuv_dir)/include',
], ],
}, },
'sources': [ 'sources': [
@ -484,6 +497,19 @@
'media/webrtc/webrtcvoiceengine.h', 'media/webrtc/webrtcvoiceengine.h',
], ],
'conditions': [ 'conditions': [
['build_libyuv==1', {
'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
}],
['build_usrsctp==1', {
'include_dirs': [
# TODO(jiayl): move this into the direct_dependent_settings of
# usrsctp.gyp.
'<(DEPTH)/third_party/usrsctp',
],
'dependencies': [
'<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
],
}],
['build_with_chromium==1', { ['build_with_chromium==1', {
'dependencies': [ 'dependencies': [
'<(webrtc_root)/modules/modules.gyp:video_capture', '<(webrtc_root)/modules/modules.gyp:video_capture',
@ -497,8 +523,6 @@
}], }],
['OS=="linux"', { ['OS=="linux"', {
'sources': [ 'sources': [
'media/devices/gtkvideorenderer.cc',
'media/devices/gtkvideorenderer.h',
'media/devices/libudevsymboltable.cc', 'media/devices/libudevsymboltable.cc',
'media/devices/libudevsymboltable.h', 'media/devices/libudevsymboltable.h',
'media/devices/linuxdeviceinfo.cc', 'media/devices/linuxdeviceinfo.cc',
@ -507,12 +531,20 @@
'media/devices/v4llookup.cc', 'media/devices/v4llookup.cc',
'media/devices/v4llookup.h', 'media/devices/v4llookup.h',
], ],
'include_dirs': [ 'conditions': [
'third_party/libudev' ['use_gtk==1', {
'sources': [
'media/devices/gtkvideorenderer.cc',
'media/devices/gtkvideorenderer.h',
], ],
'cflags': [ 'cflags': [
'<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)', '<!@(pkg-config --cflags gobject-2.0 gthread-2.0 gtk+-2.0)',
], ],
}],
],
'include_dirs': [
'third_party/libudev'
],
'libraries': [ 'libraries': [
'-lrt', '-lrt',
'-lXext', '-lXext',
@ -601,10 +633,16 @@
'target_name': 'libjingle_p2p', 'target_name': 'libjingle_p2p',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'libjingle', 'libjingle',
'libjingle_media', 'libjingle_media',
], ],
'conditions': [
['build_libsrtp==1', {
'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
],
}],
],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/testing/gtest/include', '<(DEPTH)/testing/gtest/include',
], ],

6
talk/libjingle_examples.gyp
View File

@ -97,11 +97,15 @@
'examples/peerconnection/client/peer_connection_client.h', 'examples/peerconnection/client/peer_connection_client.h',
], ],
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
'libjingle.gyp:libjingle_peerconnection', 'libjingle.gyp:libjingle_peerconnection',
'<@(libjingle_tests_additional_deps)', '<@(libjingle_tests_additional_deps)',
], ],
'conditions': [ 'conditions': [
['build_json==1', {
'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
}],
# TODO(ronghuawu): Move these files to a win/ directory then they # TODO(ronghuawu): Move these files to a win/ directory then they
# can be excluded automatically. # can be excluded automatically.
['OS=="win"', { ['OS=="win"', {

14
talk/libjingle_tests.gyp
View File

@ -31,17 +31,21 @@
'target_name': 'libjingle_unittest_main', 'target_name': 'libjingle_unittest_main',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'<@(libjingle_tests_additional_deps)', '<@(libjingle_tests_additional_deps)',
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/libyuv/include', '<(libyuv_dir)/include',
'<(DEPTH)/testing/gtest/include', '<(DEPTH)/testing/gtest/include',
'<(DEPTH)/testing/gtest', '<(DEPTH)/testing/gtest',
], ],
}, },
'conditions': [
['build_libyuv==1', {
'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
}],
],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/testing/gtest/include', '<(DEPTH)/testing/gtest/include',
'<(DEPTH)/testing/gtest', '<(DEPTH)/testing/gtest',
@ -140,7 +144,6 @@
'target_name': 'libjingle_p2p_unittest', 'target_name': 'libjingle_p2p_unittest',
'type': 'executable', 'type': 'executable',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
'<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils',
'libjingle.gyp:libjingle', 'libjingle.gyp:libjingle',
'libjingle.gyp:libjingle_p2p', 'libjingle.gyp:libjingle_p2p',
@ -160,6 +163,11 @@
'session/media/srtpfilter_unittest.cc', 'session/media/srtpfilter_unittest.cc',
], ],
'conditions': [ 'conditions': [
['build_libsrtp==1', {
'dependencies': [
'<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
],
}],
['OS=="win"', { ['OS=="win"', {
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {

8
webrtc/build/common.gypi
View File

@ -84,14 +84,16 @@
'enable_protobuf%': 1, 'enable_protobuf%': 1,
# Disable these to not build components which can be externally provided. # Disable these to not build components which can be externally provided.
'build_expat%': 1,
'build_icu%': 1,
'build_json%': 1, 'build_json%': 1,
'build_libjpeg%': 1, 'build_libjpeg%': 1,
'build_libyuv%': 1,
'build_libvpx%': 1, 'build_libvpx%': 1,
'build_vp9%': 1, 'build_libyuv%': 1,
'build_ssl%': 1,
'build_openmax_dl%': 1, 'build_openmax_dl%': 1,
'build_opus%': 1, 'build_opus%': 1,
'build_ssl%': 1,
'build_vp9%': 1,
# Disable by default # Disable by default
'have_dbus_glib%': 0, 'have_dbus_glib%': 0,

10
webrtc/build/webrtc.gni
View File

@ -37,14 +37,16 @@ declare_args() {
rtc_enable_protobuf = true rtc_enable_protobuf = true
# Disable these to not build components which can be externally provided. # Disable these to not build components which can be externally provided.
rtc_build_expat = true
rtc_build_icu = true
rtc_build_json = true rtc_build_json = true
rtc_build_libjpeg = true rtc_build_libjpeg = true
rtc_build_libyuv = true
rtc_build_libvpx = true rtc_build_libvpx = true
rtc_build_vp9 = true rtc_build_libyuv = true
rtc_build_ssl = true
rtc_build_opus = true
rtc_build_openmax_dl = true rtc_build_openmax_dl = true
rtc_build_opus = true
rtc_build_ssl = true
rtc_build_vp9 = true
# Disable by default. # Disable by default.
rtc_have_dbus_glib = false rtc_have_dbus_glib = false

20
webrtc/libjingle/libjingle.gyp
View File

@ -16,10 +16,16 @@
'target_name': 'libjingle_xmpphelp', 'target_name': 'libjingle_xmpphelp',
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
'<(talk_root)/libjingle.gyp:libjingle', '<(talk_root)/libjingle.gyp:libjingle',
'<(talk_root)/libjingle.gyp:libjingle_p2p', '<(talk_root)/libjingle.gyp:libjingle_p2p',
], ],
'conditions': [
['build_expat==1', {
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
}],
],
'sources': [ 'sources': [
'xmpp/jingleinfotask.cc', 'xmpp/jingleinfotask.cc',
'xmpp/jingleinfotask.h', 'xmpp/jingleinfotask.h',
@ -33,14 +39,10 @@
'<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp', '<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
'<(DEPTH)/third_party/expat/expat.gyp:expat',
], ],
'cflags_cc!': [ 'cflags_cc!': [
'-Wnon-virtual-dtor', '-Wnon-virtual-dtor',
], ],
'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'sources': [ 'sources': [
'session/constants.cc', 'session/constants.cc',
'session/constants.h', 'session/constants.h',
@ -87,6 +89,14 @@
'FEATURE_ENABLE_PSTN', 'FEATURE_ENABLE_PSTN',
], ],
}], }],
['build_expat==1', {
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
}],
], ],
}, },
{ {

6
webrtc/libjingle/xmllite/xmllite.gyp
View File

@ -14,11 +14,17 @@
'type': 'static_library', 'type': 'static_library',
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
],
'conditions': [
['build_expat==1', {
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
], ],
'export_dependent_settings': [ 'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat', '<(DEPTH)/third_party/expat/expat.gyp:expat',
], ],
}],
],
'sources': [ 'sources': [
'qname.cc', 'qname.cc',
'qname.h', 'qname.h',

12
webrtc/libjingle/xmpp/xmpp.gyp
View File

@ -15,7 +15,6 @@
'dependencies': [ 'dependencies': [
'<(webrtc_root)/base/base.gyp:rtc_base', '<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'<(DEPTH)/third_party/expat/expat.gyp:expat',
], ],
'defines': [ 'defines': [
'FEATURE_ENABLE_SSL', 'FEATURE_ENABLE_SSL',
@ -23,9 +22,6 @@
'cflags_cc!': [ 'cflags_cc!': [
'-Wnon-virtual-dtor', '-Wnon-virtual-dtor',
], ],
'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'sources': [ 'sources': [
'asyncsocket.h', 'asyncsocket.h',
'chatroommodule.h', 'chatroommodule.h',
@ -111,6 +107,14 @@
], ],
}, },
'conditions': [ 'conditions': [
['build_expat==1', {
'dependencies': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
}],
['build_with_chromium==0', { ['build_with_chromium==0', {
'defines': [ 'defines': [
'FEATURE_ENABLE_VOICEMAIL', 'FEATURE_ENABLE_VOICEMAIL',

10
webrtc/modules/video_capture/BUILD.gn
View File

@ -138,10 +138,12 @@ if (!build_with_chromium) {
"android/video_capture_android.h", "android/video_capture_android.h",
] ]
deps += [ if (rtc_build_json) {
"//third_party/icu:icuuc", deps += [ "//third_party/jsoncpp" ]
"//third_party/jsoncpp", }
] if (rtc_build_icu) {
deps += [ "//third_party/icu:icuuc" ]
}
} }
if (is_ios) { if (is_ios) {
sources = [ sources = [

16
webrtc/modules/video_capture/video_capture.gypi
View File

@ -116,16 +116,24 @@
}, },
}], # win }], # win
['OS=="android"', { ['OS=="android"', {
'dependencies': [
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
'sources': [ 'sources': [
'android/device_info_android.cc', 'android/device_info_android.cc',
'android/device_info_android.h', 'android/device_info_android.h',
'android/video_capture_android.cc', 'android/video_capture_android.cc',
'android/video_capture_android.h', 'android/video_capture_android.h',
], ],
'conditions': [
['build_json==1', {
'dependencies': [
'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
],
}],
['build_icu==1', {
'dependencies': [
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
],
}],
],
}], # android }], # android
['OS=="ios"', { ['OS=="ios"', {
'sources': [ 'sources': [

8
webrtc/webrtc_examples.gyp
View File

@ -15,7 +15,6 @@
'target_name': 'libwebrtcdemo-jni', 'target_name': 'libwebrtcdemo-jni',
'type': 'loadable_module', 'type': 'loadable_module',
'dependencies': [ 'dependencies': [
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(webrtc_root)/common.gyp:webrtc_common', '<(webrtc_root)/common.gyp:webrtc_common',
'<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl', '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default', '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
@ -27,6 +26,13 @@
'examples/android/media_demo/jni/on_load.cc', 'examples/android/media_demo/jni/on_load.cc',
'examples/android/media_demo/jni/voice_engine_jni.cc', 'examples/android/media_demo/jni/voice_engine_jni.cc',
], ],
'conditions': [
['build_icu==1', {
'dependencies': [
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
],
}],
],
'variables': { 'variables': {
# This library uses native JNI exports; tell GYP so that the # This library uses native JNI exports; tell GYP so that the
# required symbols will be kept. # required symbols will be kept.