generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make it easier to use external libyuv + cleanup GYP files.

Browse Source 
It is now easier to use an external libyuv library.
Fix some GYP errors.
Remove the temporary webrtc_base target (depends on
https://codereview.chromium.org/865603002/ being landed
first).

BUG=4185
R=andresp@webrtc.org, andrew@webrtc.org, perkj@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8154 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2015-01-26 19:17:26 +00:00
parent d25c034051
commit d7e34e1086
20 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DEPS
View File

@ -35,6 +35,7 @@ include_rules = [
'-base',
'-chromium',
'+gflags',
'+libyuv',
'+net',
'+talk',
'+testing',

9
webrtc/BUILD.gn
View File

@ -235,8 +235,11 @@ if (!build_with_chromium) {
source_set("webrtc_common") {
sources = [
"common_types.h",
"config.h",
"config.cc",
"engine_configurations.h",
"typedefs.h",
]
if (is_clang) {
@ -248,3 +251,9 @@ source_set("webrtc_common") {
configs += [ ":common_config" ]
public_configs = [ ":common_inherited_config" ]
}
source_set("gtest_prod") {
sources = [
"test/testsupport/gtest_prod_util.h",
]
}

10
webrtc/base/base.gyp
View File

@ -24,16 +24,6 @@
}],
],
'targets': [
{
# Temporary target until Chromium's
# src/third_party/libjingle/libjingle.gyp is updated to use rtc_base.
# TODO(kjellander): Remove when r7140 is rolled into Chromium's DEPS.
'target_name': 'webrtc_base',
'type': 'none',
'dependencies': [
'rtc_base',
],
},
{
# The subset of rtc_base approved for use outside of libjingle.
'target_name': 'rtc_base_approved',

10
webrtc/common.gyp
View File

@ -12,8 +12,18 @@
'target_name': 'webrtc_common',
'type': 'static_library',
'sources': [
'common_types.h',
'config.h',
'config.cc',
'engine_configurations.h',
'typedefs.h',
],
},
{
'target_name': 'gtest_prod',
'type': 'static_library',
'sources': [
'test/testsupport/gtest_prod_util.h',
],
},
],

1
webrtc/common_audio/common_audio.gyp
View File

@ -32,7 +32,6 @@
'audio_converter.cc',
'audio_converter.h',
'audio_util.cc',
'audio_util.h',
'blocker.cc',
'blocker.h',
'fir_filter.cc',

1
webrtc/common_video/BUILD.gn
View File

@ -48,6 +48,7 @@ source_set("common_video") {
if (rtc_build_libyuv) {
deps += [ "//third_party/libyuv" ]
public_deps = [ "//third_party/libyuv" ]
} else {
# Need to add a directory normally exported by libyuv.
include_dirs += [ "//third_party/libyuv/include" ]

3
webrtc/common_video/common_video.gyp
View File

@ -29,6 +29,9 @@
'conditions': [
['build_libyuv==1', {
'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
'export_dependent_settings': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
],
}, {
# Need to add a directory normally exported by libyuv.gyp.
'include_dirs': ['<(libyuv_dir)/include',],

2
webrtc/libjingle/libjingle.gyp
View File

@ -30,7 +30,7 @@
'type': 'static_library',
'dependencies': [
'<(talk_root)/libjingle.gyp:libjingle_media',
'<(webrtc_root)/base/base.gyp:webrtc_base',
'<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/libjingle/xmpp/xmpp.gyp:rtc_xmpp',
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],

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

@ -13,7 +13,7 @@
'target_name': 'rtc_xmpp',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/base/base.gyp:webrtc_base',
'<(webrtc_root)/base/base.gyp:rtc_base',
'<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
'<(DEPTH)/third_party/expat/expat.gyp:expat',
],
@ -138,4 +138,4 @@
],
}],
}

1
webrtc/modules/audio_device/BUILD.gn
View File

@ -141,6 +141,7 @@ source_set("audio_device") {
libs = [
"AudioToolbox.framework",
"AVFoundation.framework",
"Foundation.framework",
]
}
if (is_win) {

1
webrtc/modules/audio_device/audio_device.gypi
View File

@ -192,6 +192,7 @@
'OTHER_LDFLAGS': [
'-framework AudioToolbox',
'-framework AVFoundation',
'-framework Foundation',
],
},
},

6
webrtc/modules/video_coding/BUILD.gn
View File

@ -178,12 +178,6 @@ source_set("webrtc_vp8") {
"//third_party/libvpx",
]
}
if (rtc_build_libyuv) {
deps += [ "//third_party/libyuv" ]
} else {
# Need to add a directory normally exported by libyuv.
include_dirs += [ "//third_party/libyuv/include" ]
}
}
source_set("webrtc_vp9") {

3
webrtc/modules/video_coding/codecs/vp8/vp8.gyp
View File

@ -48,9 +48,6 @@
'msvs_disabled_warnings': [
4267, # size_t to int truncation.
],
'include_dirs': [
'<(libyuv_dir)/include',
],
},
], # targets
'conditions': [

4
webrtc/p2p/p2p.gyp
View File

@ -13,7 +13,7 @@
'target_name': 'rtc_p2p',
'type': 'static_library',
'dependencies': [
'<(webrtc_root)/base/base.gyp:webrtc_base',
'<(webrtc_root)/base/base.gyp:rtc_base',
],
'cflags_cc!': [
'-Wnon-virtual-dtor',
@ -113,4 +113,4 @@
],
}],
}

4
webrtc/tools/converter/converter.h
View File

@ -13,8 +13,8 @@
#include <string>
#include "third_party/libyuv/include/libyuv/compare.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "libyuv/compare.h" // NOLINT
#include "libyuv/convert.h" // NOLINT
namespace webrtc {
namespace test {

4
webrtc/tools/frame_analyzer/video_quality_analysis.h
View File

@ -14,8 +14,8 @@
#include <string>
#include <vector>
#include "third_party/libyuv/include/libyuv/compare.h"
#include "third_party/libyuv/include/libyuv/convert.h"
#include "libyuv/compare.h" // NOLINT
#include "libyuv/convert.h" // NOLINT
namespace webrtc {
namespace test {

6
webrtc/tools/tools.gyp
View File

@ -15,10 +15,10 @@
'target_name': 'video_quality_analysis',
'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
],
'export_dependent_settings': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
'<(webrtc_root)/common_video/common_video.gyp:common_video',
],
'sources': [
'frame_analyzer/video_quality_analysis.h',
@ -51,8 +51,8 @@
'target_name': 'rgba_to_i420_converter',
'type': 'executable',
'dependencies': [
'<(webrtc_root)/common_video/common_video.gyp:common_video',
'<(webrtc_root)/tools/internal_tools.gyp:command_line_parser',
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
],
'sources': [
'converter/converter.h',

3
webrtc/voice_engine/BUILD.gn
View File

@ -11,9 +11,6 @@ import("../build/webrtc.gni")
source_set("voice_engine") {
sources = [
"../common_types.h",
"../engine_configurations.h",
"../typedefs.h",
"include/voe_audio_processing.h",
"include/voe_base.h",
"include/voe_codec.h",

3
webrtc/voice_engine/voice_engine.gyp
View File

@ -27,9 +27,6 @@
'<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
],
'sources': [
'../common_types.h',
'../engine_configurations.h',
'../typedefs.h',
'include/voe_audio_processing.h',
'include/voe_base.h',
'include/voe_codec.h',

2
webrtc/webrtc.gyp
View File

@ -31,6 +31,7 @@
'modules/modules.gyp:*',
'p2p/p2p.gyp:*',
'system_wrappers/system_wrappers.gyp:*',
'tools/tools.gyp:*',
'video_engine/video_engine.gyp:*',
'voice_engine/voice_engine.gyp:*',
'<(webrtc_vp8_dir)/vp8.gyp:*',
@ -53,7 +54,6 @@
'test/metrics.gyp:*',
'test/test.gyp:*',
'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
'tools/tools.gyp:*',
'webrtc_tests',
'rtc_unittests',
],