diff options
| author | perkj@webrtc.org <perkj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-13 08:15:48 +0000 |
|---|---|---|
| committer | perkj@webrtc.org <perkj@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-13 08:15:48 +0000 |
| commit | 50daa5310285079d9e5155b2bc0c95210756e593 (patch) | |
| tree | 324e54bd35c21091206bd854803a7b711723c6d7 /build | |
| parent | c9ccea39fb320a846deef9ac31a66a50197a554b (diff) | |
| download | webrtc-50daa5310285079d9e5155b2bc0c95210756e593.tar.gz | |
Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.
http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457
> 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
TBR=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14479004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 43 | ||||
| -rw-r--r-- | build/merge_libs.gyp | 1 |
2 files changed, 6 insertions, 38 deletions
diff --git a/build/common.gypi b/build/common.gypi index 233b1b8c..a0771140 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -89,9 +89,6 @@ 'build_libyuv%': 1, 'build_libvpx%': 1, - # Disable by default - 'have_dbus_glib%': 0, - # Enable to use the Mozilla internal settings. 'build_with_mozilla%': 0, @@ -147,6 +144,9 @@ }, '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,14 +161,6 @@ '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',], }], @@ -176,15 +168,6 @@ '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': [ @@ -347,6 +330,9 @@ }], ], # conditions 'direct_dependent_settings': { + 'include_dirs': [ + '../..', + ], 'conditions': [ ['build_with_mozilla==1', { 'defines': [ @@ -359,16 +345,6 @@ # 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': [ @@ -404,13 +380,6 @@ }] ], }], - ['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/build/merge_libs.gyp b/build/merge_libs.gyp index 02f420b7..4f8cdac8 100644 --- a/build/merge_libs.gyp +++ b/build/merge_libs.gyp @@ -10,7 +10,6 @@ 'includes': ['common.gypi',], 'variables': { 'merge_libs_dependencies': [ - '../base/base_tests.gyp:webrtc_base_tests_utils', '../webrtc.gyp:webrtc', ], }, |