diff options
| author | henrikg <henrikg@webrtc.org> | 2015-09-21 02:53:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-21 09:53:05 +0000 |
| commit | baae0a8a6c873ddf812a5687b84638359b2e7e5b (patch) | |
| tree | 293fb6520991a98a1543d15ea1163fcbc6701a87 /webrtc/base/base.gyp | |
| parent | 35d1767cc3ae1fd48e8fd01b0b8ed9061734538e (diff) | |
| download | webrtc-baae0a8a6c873ddf812a5687b84638359b2e7e5b.tar.gz | |
Update build files to use webrtc_overrides in Chromium instead of overrides.
This is a part of moving the overrides to Chromium. See bug comment #65 for all steps.
BUG=chromium:468375
Review URL: https://codereview.webrtc.org/1354933002
Cr-Commit-Position: refs/heads/master@{#9996}
Diffstat (limited to 'webrtc/base/base.gyp')
| -rw-r--r-- | webrtc/base/base.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index 1536b4f8b9..755cb3f750 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', { |