| Index: webrtc/base/base.gyp
|
| diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
|
| index 1536b4f8b96cce5ccab2d6fbbebe61a065974007..755cb3f7506776e7c96438d7b99ba5a3f7be31f8 100644
|
| --- a/webrtc/base/base.gyp
|
| +++ b/webrtc/base/base.gyp
|
| @@ -84,7 +84,7 @@
|
| 'conditions': [
|
| ['build_with_chromium==1', {
|
| 'include_dirs': [
|
| - '../overrides',
|
| + '../../webrtc_overrides',
|
| ],
|
| 'sources!': [
|
| 'basictypes.h',
|
| @@ -338,9 +338,9 @@
|
| 'worker.h',
|
| 'x11windowpicker.cc',
|
| 'x11windowpicker.h',
|
| - '../overrides/webrtc/base/logging.cc',
|
| - '../overrides/webrtc/base/logging.h',
|
| - '../overrides/webrtc/base/win32socketinit.cc',
|
| + '../../webrtc_overrides/webrtc/base/logging.cc',
|
| + '../../webrtc_overrides/webrtc/base/logging.h',
|
| + '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
|
| ],
|
| # TODO(henrike): issue 3307, make rtc_base build without disabling
|
| # these flags.
|
| @@ -366,7 +366,7 @@
|
| 'conditions': [
|
| ['build_with_chromium==1', {
|
| 'include_dirs': [
|
| - '../overrides',
|
| + '../../webrtc_overrides',
|
| '../../boringssl/src/include',
|
| ],
|
| 'sources!': [
|
| @@ -481,9 +481,9 @@
|
| }],
|
| ],
|
| 'sources!': [
|
| - '../overrides/webrtc/base/win32socketinit.cc',
|
| - '../overrides/webrtc/base/logging.cc',
|
| - '../overrides/webrtc/base/logging.h',
|
| + '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
|
| + '../../webrtc_overrides/webrtc/base/logging.cc',
|
| + '../../webrtc_overrides/webrtc/base/logging.h',
|
| ],
|
| }],
|
| ['use_openssl==1', {
|
|
|