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

Unified Diff: webrtc/base/base.gyp

Issue 1386613002: Fix MSVS project files generation. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 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 | « no previous file | no next file » | 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 78742e00bc024b879e02e553bcc7259cc9882938..d8232a4c25a97413921557d4ea4ec0a5684b56df 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -87,8 +87,6 @@
'../../webrtc_overrides',
],
'sources!': [
- 'basictypes.h',
- 'constructormagic.h',
'logging.cc',
'logging.h',
],
@@ -349,9 +347,6 @@
'worker.h',
'x11windowpicker.cc',
'x11windowpicker.h',
- '../../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.
@@ -382,6 +377,11 @@
'../../webrtc_overrides',
'../../boringssl/src/include',
],
+ 'sources': [
+ '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
kjellander_webrtc 2015/10/03 17:06:30 nit: sort alphabetically.
Henrik Grunell WebRTC 2015/10/05 07:29:32 Will fix in follow-up.
+ '../../webrtc_overrides/webrtc/base/logging.cc',
+ '../../webrtc_overrides/webrtc/base/logging.h',
+ ],
'sources!': [
'atomicops.h',
'bandwidthsmoother.cc',
@@ -493,11 +493,6 @@
],
}],
],
- 'sources!': [
- '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
- '../../webrtc_overrides/webrtc/base/logging.cc',
- '../../webrtc_overrides/webrtc/base/logging.h',
- ],
}],
['OS == "android"', {
'link_settings': {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698