Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: webrtc/base/base.gyp

Issue 1345313004: Update build files to use webrtc_overrides in Chromium instead of overrides. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index b111dacfd94a8ab100b2e153e96cbdf061bbad21..78742e00bc024b879e02e553bcc7259cc9882938 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',
@@ -349,9 +349,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.
@@ -379,7 +379,7 @@
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
- '../overrides',
+ '../../webrtc_overrides',
'../../boringssl/src/include',
],
'sources!': [
@@ -494,9 +494,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',
],
}],
['OS == "android"', {
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698