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

Unified Diff: libraries/nacl-mounts/nacl-nacl-mounts.sh

Issue 10392070: Socket subsystem implementation (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src/
Patch Set: Created 8 years, 6 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 | « libraries/nacl-mounts/http2/HTTP2Mount.cc ('k') | libraries/nacl-mounts/net/BaseSocketSubSystem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/nacl-mounts/nacl-nacl-mounts.sh
===================================================================
--- libraries/nacl-mounts/nacl-nacl-mounts.sh (revision 594)
+++ libraries/nacl-mounts/nacl-nacl-mounts.sh (working copy)
@@ -59,7 +59,10 @@
MakeDir ${PACKAGE_DIR}
ChangeDir ${PACKAGE_DIR}
set -x
- export CXXCMD="${NACLCC} -I${START_DIR}"
+ export CXXCMD="${NACLCC} -I${START_DIR}/../ -I${START_DIR}"
+ ${CXXCMD} -c ${START_DIR}/net/TcpSocket.cc
+ ${CXXCMD} -c ${START_DIR}/net/TcpServerSocket.cc
+ ${CXXCMD} -c ${START_DIR}/net/SocketSubSystem.cc
${CXXCMD} -c ${START_DIR}/buffer/BufferMount.cc
${CXXCMD} -c ${START_DIR}/http2/HTTP2Mount.cc
${CXXCMD} -c ${START_DIR}/http2/HTTP2FSOpenJob.cc
@@ -71,7 +74,6 @@
${CXXCMD} -c ${START_DIR}/base/MainThreadRunner.cc
${CXXCMD} -c ${START_DIR}/base/UrlLoaderJob.cc
${CXXCMD} -c ${START_DIR}/util/Path.cc
- ${CXXCMD} -c ${START_DIR}/util/SimpleAutoLock.cc
${CXXCMD} -c ${START_DIR}/util/nacl_simple_tar.c
${CXXCMD} -c ${START_DIR}/console/terminal.c
${CXXCMD} -c ${START_DIR}/console/terminal_stubs.c
@@ -96,7 +98,6 @@
MainThreadRunner.o \
UrlLoaderJob.o \
Path.o \
- SimpleAutoLock.o \
nacl_simple_tar.o \
terminal.o \
terminal_stubs.o \
@@ -118,6 +119,9 @@
ConsoleMount.o \
JSPipeMount.o \
JSPostMessageBridge.o \
+ TcpSocket.o \
+ TcpServerSocket.o \
+ SocketSubSystem.o \
BufferMount.o
${NACLRANLIB} libnacl-mounts.a
@@ -132,20 +136,26 @@
cp ${START_DIR}/console/console.js ${NACL_SDK_USR_LIB}/nacl-mounts
cp ${START_DIR}/http2/genfs.py ${NACL_SDK_USR_LIB}/nacl-mounts/util
- # GLibC toolcahin has termio.h so don't copy stub header.
+ # GLibC toolchain has termio.h so don't copy stub header.
if [[ $NACL_GLIBC == 0 ]]; then
cp ${START_DIR}/console/termio.h ${NACL_SDK_USR_INCLUDE}
fi
mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts
- for DIR in console base util memory http2 AppEngine pepper buffer; do
+ for DIR in console base util memory net http2 AppEngine pepper buffer; do
mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR}
cp ${START_DIR}/${DIR}/*.h ${NACL_SDK_USR_INCLUDE}/nacl-mounts/${DIR}
done
+ mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private
+ mkdir -p ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private
+ cp -R ${START_DIR}/ppapi/cpp/private/*.h \
+ ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/cpp/private/
+ cp -R ${START_DIR}/ppapi/c/private/*.h \
+ ${NACL_SDK_USR_INCLUDE}/nacl-mounts/ppapi/c/private/
}
CustomPackageInstall() {
- RunTests
+# RunTests
DefaultPreInstallStep
CustomBuildStep
CustomInstallStep
« no previous file with comments | « libraries/nacl-mounts/http2/HTTP2Mount.cc ('k') | libraries/nacl-mounts/net/BaseSocketSubSystem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698