generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing sources to webrtc/base/base.gyp

Browse Source 
During my work on setting up a GN build for
WebRTC, I discovered that the base.gyp is trying
to remove source files (for the Chromium build)
that are not added in the initial set.
I assume these files should be listed and that
GYP just doesn't complain when it's trying to
remove a file that is not present in the sources
list.

natserver_main.cc is also removed, since it's not used anywhere.

There are also a couple of other header files that are
used in other code that probably also should be listed in
base.gyp (please do this in another CL):
* compile_assert.h
* dscp.h
* move.h
* template_util.h

BUG=None
TEST=Trybots passing clobber compile step.
R=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/13659004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6438 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-06-16 07:11:19 +00:00
parent 117afeec91
commit 2bae3211b1
3 changed files with 11 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/base/base.gyp
View File

@ -40,6 +40,7 @@
'asynchttprequest.h',
'asyncinvoker.cc',
'asyncinvoker.h',
'asyncinvoker-inl.h',
'asyncpacketsocket.h',
'asyncresolverinterface.h',
'asyncsocket.cc',
@ -58,11 +59,13 @@
'basicdefs.h',
'basictypes.h',
'bind.h',
'bind.h.pump',
'buffer.h',
'bytebuffer.cc',
'bytebuffer.h',
'byteorder.h',
'callback.h',
'callback.h.pump',
'checks.cc',
'checks.h',
'common.cc',
@ -113,12 +116,15 @@
'json.cc',
'json.h',
'latebindingsymboltable.cc',
'latebindingsymboltable.cc.def',
'latebindingsymboltable.h',
'latebindingsymboltable.h.def',
'libdbusglibsymboltable.cc',
'libdbusglibsymboltable.h',
'linux.cc',
'linux.h',
'linuxfdwalk.c',
'linuxfdwalk.h',
'linuxwindowpicker.cc',
'linuxwindowpicker.h',
'linked_ptr.h',
@ -197,6 +203,8 @@
'refcount.h',
'referencecountedsingletonfactory.h',
'rollingaccumulator.h',
'safe_conversions.h',
'safe_conversions_impl.h',
'schanneladapter.cc',
'schanneladapter.h',
'scoped_autorelease_pool.h',
@ -351,10 +359,6 @@
'dbus.h',
'diskcache_win32.cc',
'diskcache_win32.h',
'fakecpumonitor.h',
'fakenetwork.h',
'fakesslidentity.h',
'faketaskrunner.h',
'filelock.cc',
'filelock.h',
'fileutils_mock.h',
@ -389,7 +393,6 @@
'multipart.h',
'natserver.cc',
'natserver.h',
'natserver_main.cc',
'natsocketfactory.cc',
'natsocketfactory.h',
'nattypes.cc',
@ -419,8 +422,6 @@
'testbase64.h',
'testclient.cc',
'testclient.h',
'testechoserver.h',
'testutils.h',
'transformadapter.cc',
'transformadapter.h',
'versionparsing.cc',
@ -433,7 +434,6 @@
'win32socketinit.h',
'win32socketserver.cc',
'win32socketserver.h',
'win32toolhelp.h',
'window.h',
'windowpickerfactory.h',
'windowpicker.h',

3
webrtc/base/base_tests.gyp
View File

@ -22,6 +22,7 @@
'gunit.h',
'testbase64.h',
'testechoserver.h',
'testutils.h',
'win32toolhelp.h',
],
'dependencies': [
@ -83,6 +84,8 @@
'sharedexclusivelock_unittest.cc',
'signalthread_unittest.cc',
'sigslot_unittest.cc',
'sigslottester.h',
'sigslottester.h.pump',
'socket_unittest.cc',
'socket_unittest.h',
'socketaddress_unittest.cc',

40
webrtc/base/natserver_main.cc
View File

@ -1,40 +0,0 @@
/*
* Copyright 2004 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include <iostream>
#include "webrtc/base/natserver.h"
#include "webrtc/base/host.h"
#include "webrtc/base/physicalsocketserver.h"
using namespace rtc;
int main(int argc, char* argv[]) {
if (argc != 3) {
std::cerr << "usage: natserver <internal-ip> <external-ip>" << std::endl;
exit(1);
}
SocketAddress internal = SocketAddress(argv[1]);
SocketAddress external = SocketAddress(argv[2]);
if (internal.EqualIPs(external)) {
std::cerr << "internal and external IPs must differ" << std::endl;
exit(1);
}
Thread* pthMain = Thread::Current();
PhysicalSocketServer* ss = new PhysicalSocketServer();
pthMain->set_socketserver(ss);
NATServer* server = new NATServer(NAT_OPEN_CONE, ss, internal, ss, external);
server = server;
pthMain->Run();
return 0;
}