Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
BUG=N/A
R=andrew@webrtc.org, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12199004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6107 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a077114..233b1b8 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -89,6 +89,9 @@
'build_libyuv%': 1,
'build_libvpx%': 1,
+ # Disable by default
+ 'have_dbus_glib%': 0,
+
# Enable to use the Mozilla internal settings.
'build_with_mozilla%': 0,
@@ -144,9 +147,6 @@
},
'target_defaults': {
'include_dirs': [
- # Allow includes to be prefixed with webrtc/ in case it is not an
- # immediate subdirectory of <(DEPTH).
- '../..',
# To include the top-level directory when building in Chrome, so we can
# use full paths (e.g. headers inside testing/ or third_party/).
'<(DEPTH)',
@@ -161,6 +161,14 @@
'WEBRTC_MOZILLA_BUILD',
],
}],
+ ['have_dbus_glib==1', {
+ 'defines': [
+ 'HAVE_DBUS_GLIB',
+ ],
+ 'cflags': [
+ '<!@(pkg-config --cflags dbus-glib-1)',
+ ],
+ }],
['enable_video==1', {
'defines': ['WEBRTC_MODULE_UTILITY_VIDEO',],
}],
@@ -168,6 +176,15 @@
'defines': [
# Changes settings for Chromium build.
'WEBRTC_CHROMIUM_BUILD',
+ 'LOGGING_INSIDE_WEBRTC',
+ ],
+ 'include_dirs': [
+ # overrides must be included first as that is the mechanism for
+ # selecting the override headers in Chromium.
+ '../overrides',
+ # Allow includes to be prefixed with webrtc/ in case it is not an
+ # immediate subdirectory of <(DEPTH).
+ '../..',
],
}, {
'conditions': [
@@ -330,9 +347,6 @@
}],
], # conditions
'direct_dependent_settings': {
- 'include_dirs': [
- '../..',
- ],
'conditions': [
['build_with_mozilla==1', {
'defines': [
@@ -345,6 +359,16 @@
# Changes settings for Chromium build.
'WEBRTC_CHROMIUM_BUILD',
],
+ 'include_dirs': [
+ # overrides must be included first as that is the mechanism for
+ # selecting the override headers in Chromium.
+ '../overrides',
+ '../..',
+ ],
+ }, {
+ 'include_dirs': [
+ '../..',
+ ],
}],
['OS=="mac"', {
'defines': [
@@ -380,6 +404,13 @@
}]
],
}],
+ ['os_posix==1', {
+ # For access to standard POSIXish features, use WEBRTC_POSIX instead
+ # of a more specific macro.
+ 'defines': [
+ 'WEBRTC_POSIX',
+ ],
+ }],
],
},
}, # target_defaults
diff --git a/webrtc/build/merge_libs.gyp b/webrtc/build/merge_libs.gyp
index 4f8cdac..02f420b 100644
--- a/webrtc/build/merge_libs.gyp
+++ b/webrtc/build/merge_libs.gyp
@@ -10,6 +10,7 @@
'includes': ['common.gypi',],
'variables': {
'merge_libs_dependencies': [
+ '../base/base_tests.gyp:webrtc_base_tests_utils',
'../webrtc.gyp:webrtc',
],
},