[NaCl SDK] Add libppapi_cpp_private to the SDK

BUG=241512
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14743017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200729 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 106 insertions, 9 deletions

diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index 185bd2b..e84be60 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -132,8 +132,7 @@ def UpdateProjects(pepperdir, platform, project_tree, toolchains,
                                        targets)
 
 
-def BuildProjectsBranch(pepperdir, platform, branch, deps=True, clean=False,
-                        config='Debug'):
+def BuildProjectsBranch(pepperdir, platform, branch, deps, clean, config):
   make_dir = os.path.join(pepperdir, branch)
   print "\n\nMake: " + make_dir
   if platform == 'win':
@@ -175,11 +174,14 @@ def BuildProjects(pepperdir, platform, project_tree, deps=True,
 
 def main(args):
   parser = optparse.OptionParser()
-  parser.add_option('--clobber',
+  parser.add_option('-c', '--clobber',
       help='Clobber project directories before copying new files',
       action='store_true', default=False)
   parser.add_option('-b', '--build',
       help='Build the projects.', action='store_true')
+  parser.add_option('--config',
+      help='Choose configuration to build (Debug or Release).  Builds both '
+           'by default')
   parser.add_option('-x', '--experimental',
       help='Build experimental projects', action='store_true')
   parser.add_option('-t', '--toolchain',
@@ -193,10 +195,14 @@ def main(args):
       action='append')
   parser.add_option('-v', '--verbose', action='store_true')
 
-  options, files = parser.parse_args(args[1:])
-  if len(files):
-    parser.error('Not expecting files.')
-    return 1
+  options, args = parser.parse_args(args[1:])
+  if args:
+    parser.error('Not expecting any arguments.')
+
+  if 'NACL_SDK_ROOT' in os.environ:
+    # We don't want the currently configured NACL_SDK_ROOT to have any effect
+    # on the build.
+    del os.environ['NACL_SDK_ROOT']
 
   pepper_ver = str(int(build_version.ChromeMajorVersion()))
   pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver)
@@ -228,8 +234,15 @@ def main(args):
   UpdateHelpers(pepperdir, platform, clobber=options.clobber)
   UpdateProjects(pepperdir, platform, project_tree, options.toolchain,
                  clobber=options.clobber)
+
   if options.build:
-    BuildProjects(pepperdir, platform, project_tree)
+    if options.config:
+      configs = [options.config]
+    else:
+      configs = ['Debug', 'Release']
+    for config in configs:
+      BuildProjects(pepperdir, platform, project_tree, config=config)
+
   return 0
 
 
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 1ebf88d..e46c42b 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -318,6 +318,24 @@ PPAPI_HEADER_MAP = [
   ('cpp/extensions/*.h',     'ppapi/cpp/extensions/'),
   ('cpp/dev/*.h',            'ppapi/cpp/dev/'),
   ('cpp/extensions/dev/*.h', 'ppapi/cpp/extensions/dev/'),
+
+  # Copy certain private headers (specifically these are the ones
+  # that are used by nacl-mounts)
+  ('cpp/private/ext_crx_file_system_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/net_address_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/tcp_server_socket_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/host_resolver_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/tcp_socket_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/udp_socket_private.h', 'ppapi/cpp/private/'),
+  ('cpp/private/x509_certificate_private.h', 'ppapi/cpp/private/'),
+
+  ('c/private/ppb_ext_crx_file_system_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_host_resolver_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_tcp_server_socket_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_net_address_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_tcp_socket_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_udp_socket_private.h', 'ppapi/c/private/'),
+  ('c/private/ppb_x509_certificate_private.h', 'ppapi/c/private/'),
 ]
 
 
diff --git a/native_client_sdk/src/build_tools/sdk_files.list b/native_client_sdk/src/build_tools/sdk_files.list
index b28acc6..ab8ef9f 100644
--- a/native_client_sdk/src/build_tools/sdk_files.list
+++ b/native_client_sdk/src/build_tools/sdk_files.list
@@ -318,6 +318,20 @@ include/ppapi/c/ppb_var.h
 include/ppapi/c/ppb_view.h
 include/ppapi/c/ppb_websocket.h
 include/ppapi/c/pp_completion_callback.h
+include/ppapi/c/private/ppb_ext_crx_file_system_private.h
+include/ppapi/c/private/ppb_host_resolver_private.h
+include/ppapi/c/private/ppb_net_address_private.h
+include/ppapi/c/private/ppb_tcp_server_socket_private.h
+include/ppapi/c/private/ppb_tcp_socket_private.h
+include/ppapi/c/private/ppb_udp_socket_private.h
+include/ppapi/c/private/ppb_x509_certificate_private.h
+include/ppapi/cpp/private/ext_crx_file_system_private.h
+include/ppapi/cpp/private/host_resolver_private.h
+include/ppapi/cpp/private/net_address_private.h
+include/ppapi/cpp/private/tcp_server_socket_private.h
+include/ppapi/cpp/private/tcp_socket_private.h
+include/ppapi/cpp/private/udp_socket_private.h
+include/ppapi/cpp/private/x509_certificate_private.h
 include/ppapi/cpp/completion_callback.h
 include/ppapi/cpp/core.h
 include/ppapi/cpp/dev/audio_input_dev.h
@@ -444,6 +458,8 @@ lib/glibc_x86_32/Debug/libnacl_io.a
 lib/glibc_x86_32/Debug/libnacl_io.so
 lib/glibc_x86_32/Debug/libppapi_cpp.a
 lib/glibc_x86_32/Debug/libppapi_cpp.so
+lib/glibc_x86_32/Debug/libppapi_cpp_private.a
+lib/glibc_x86_32/Debug/libppapi_cpp_private.so
 lib/glibc_x86_32/Debug/libppapi_gles2.a
 lib/glibc_x86_32/Debug/libppapi_gles2.so
 lib/glibc_x86_32/Debug/libppapi_main.a
@@ -453,6 +469,8 @@ lib/glibc_x86_32/Release/libnacl_io.a
 lib/glibc_x86_32/Release/libnacl_io.so
 lib/glibc_x86_32/Release/libppapi_cpp.a
 lib/glibc_x86_32/Release/libppapi_cpp.so
+lib/glibc_x86_32/Release/libppapi_cpp_private.a
+lib/glibc_x86_32/Release/libppapi_cpp_private.so
 lib/glibc_x86_32/Release/libppapi_gles2.a
 lib/glibc_x86_32/Release/libppapi_gles2.so
 lib/glibc_x86_32/Release/libppapi_main.a
@@ -462,6 +480,8 @@ lib/glibc_x86_64/Debug/libnacl_io.a
 lib/glibc_x86_64/Debug/libnacl_io.so
 lib/glibc_x86_64/Debug/libppapi_cpp.a
 lib/glibc_x86_64/Debug/libppapi_cpp.so
+lib/glibc_x86_64/Debug/libppapi_cpp_private.a
+lib/glibc_x86_64/Debug/libppapi_cpp_private.so
 lib/glibc_x86_64/Debug/libppapi_gles2.a
 lib/glibc_x86_64/Debug/libppapi_gles2.so
 lib/glibc_x86_64/Debug/libppapi_main.a
@@ -471,26 +491,32 @@ lib/glibc_x86_64/Release/libnacl_io.a
 lib/glibc_x86_64/Release/libnacl_io.so
 lib/glibc_x86_64/Release/libppapi_cpp.a
 lib/glibc_x86_64/Release/libppapi_cpp.so
+lib/glibc_x86_64/Release/libppapi_cpp_private.a
+lib/glibc_x86_64/Release/libppapi_cpp_private.so
 lib/glibc_x86_64/Release/libppapi_gles2.a
 lib/glibc_x86_64/Release/libppapi_gles2.so
 lib/glibc_x86_64/Release/libppapi_main.a
 [linux]lib/${PLATFORM}_host/Debug/libjsoncpp.a
 [linux]lib/${PLATFORM}_host/Debug/libppapi.a
 [linux]lib/${PLATFORM}_host/Debug/libppapi_cpp.a
+[linux]lib/${PLATFORM}_host/Debug/libppapi_cpp_private.a
 [linux]lib/${PLATFORM}_host/Debug/libppapi_gles2.a
 [linux]lib/${PLATFORM}_host/Release/libjsoncpp.a
 [linux]lib/${PLATFORM}_host/Release/libppapi.a
 [linux]lib/${PLATFORM}_host/Release/libppapi_cpp.a
+[linux]lib/${PLATFORM}_host/Release/libppapi_cpp_private.a
 [linux]lib/${PLATFORM}_host/Release/libppapi_gles2.a
 [win]lib/${PLATFORM}_x86_32_host/Debug/jsoncpp.lib
 [win]lib/${PLATFORM}_x86_32_host/Debug/nacl_io.lib
 [win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_cpp_private.lib
 [win]lib/${PLATFORM}_x86_32_host/Debug/ppapi_gles2.lib
 [win]lib/${PLATFORM}_x86_32_host/Debug/ppapi.lib
 [win]lib/${PLATFORM}_x86_32_host/Debug/pthread.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/jsoncpp.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/nacl_io.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp.lib
+[win]lib/${PLATFORM}_x86_32_host/Release/ppapi_cpp_private.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/ppapi_gles2.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/ppapi.lib
 [win]lib/${PLATFORM}_x86_32_host/Release/pthread.lib
@@ -498,46 +524,54 @@ lib/newlib_arm/Debug/liberror_handling.a
 lib/newlib_arm/Debug/libjsoncpp.a
 lib/newlib_arm/Debug/libnacl_io.a
 lib/newlib_arm/Debug/libppapi_cpp.a
+lib/newlib_arm/Debug/libppapi_cpp_private.a
 lib/newlib_arm/Debug/libppapi_gles2.a
 lib/newlib_arm/Debug/libppapi_main.a
 lib/newlib_arm/Release/liberror_handling.a
 lib/newlib_arm/Release/libjsoncpp.a
 lib/newlib_arm/Release/libnacl_io.a
 lib/newlib_arm/Release/libppapi_cpp.a
+lib/newlib_arm/Release/libppapi_cpp_private.a
 lib/newlib_arm/Release/libppapi_gles2.a
 lib/newlib_arm/Release/libppapi_main.a
 lib/newlib_x86_32/Debug/liberror_handling.a
 lib/newlib_x86_32/Debug/libjsoncpp.a
 lib/newlib_x86_32/Debug/libnacl_io.a
 lib/newlib_x86_32/Debug/libppapi_cpp.a
+lib/newlib_x86_32/Debug/libppapi_cpp_private.a
 lib/newlib_x86_32/Debug/libppapi_gles2.a
 lib/newlib_x86_32/Debug/libppapi_main.a
 lib/newlib_x86_32/Release/liberror_handling.a
 lib/newlib_x86_32/Release/libjsoncpp.a
 lib/newlib_x86_32/Release/libnacl_io.a
 lib/newlib_x86_32/Release/libppapi_cpp.a
+lib/newlib_x86_32/Release/libppapi_cpp_private.a
 lib/newlib_x86_32/Release/libppapi_gles2.a
 lib/newlib_x86_32/Release/libppapi_main.a
 lib/newlib_x86_64/Debug/liberror_handling.a
 lib/newlib_x86_64/Debug/libjsoncpp.a
 lib/newlib_x86_64/Debug/libnacl_io.a
 lib/newlib_x86_64/Debug/libppapi_cpp.a
+lib/newlib_x86_64/Debug/libppapi_cpp_private.a
 lib/newlib_x86_64/Debug/libppapi_gles2.a
 lib/newlib_x86_64/Debug/libppapi_main.a
 lib/newlib_x86_64/Release/liberror_handling.a
 lib/newlib_x86_64/Release/libjsoncpp.a
 lib/newlib_x86_64/Release/libnacl_io.a
 lib/newlib_x86_64/Release/libppapi_cpp.a
+lib/newlib_x86_64/Release/libppapi_cpp_private.a
 lib/newlib_x86_64/Release/libppapi_gles2.a
 lib/newlib_x86_64/Release/libppapi_main.a
 lib/pnacl/Debug/libjsoncpp.a
 lib/pnacl/Debug/libnacl_io.a
 lib/pnacl/Debug/libppapi_cpp.a
+lib/pnacl/Debug/libppapi_cpp_private.a
 lib/pnacl/Debug/libppapi_gles2.a
 lib/pnacl/Debug/libppapi_main.a
 lib/pnacl/Release/libjsoncpp.a
 lib/pnacl/Release/libnacl_io.a
 lib/pnacl/Release/libppapi_cpp.a
+lib/pnacl/Release/libppapi_cpp_private.a
 lib/pnacl/Release/libppapi_gles2.a
 lib/pnacl/Release/libppapi_main.a
 LICENSE
@@ -631,6 +665,15 @@ src/ppapi_main/ppapi_instance3d.cc
 src/ppapi_main/ppapi_instance.cc
 src/ppapi_main/ppapi_main.cc
 src/ppapi_main/ppapi_queue.cc
+src/ppapi_cpp_private/Makefile
+src/ppapi_cpp_private/make.bat
+src/ppapi_cpp_private/net_address_private.cc
+src/ppapi_cpp_private/tcp_socket_private.cc
+src/ppapi_cpp_private/udp_socket_private.cc
+src/ppapi_cpp_private/ext_crx_file_system_private.cc
+src/ppapi_cpp_private/host_resolver_private.cc
+src/ppapi_cpp_private/tcp_server_socket_private.cc
+src/ppapi_cpp_private/x509_certificate_private.cc
 [win]src/pthread/autostatic.c
 [win]src/pthread/cleanup.c
 [win]src/pthread/CONTRIBUTORS
diff --git a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
index f44850d..2914c92 100644
--- a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
+++ b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
@@ -44,7 +44,6 @@
           'view.cc',
           'websocket.cc',
 
-
           # Utility sources.
           'paint_aggregator.cc',
           'paint_manager.cc',
diff --git a/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
new file mode 100644
index 0000000..f4ff1f4
--- /dev/null
+++ b/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
@@ -0,0 +1,24 @@
+{
+  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'SEARCH': [
+      '../../../../ppapi/cpp/private',
+  ],
+  'TARGETS': [
+    {
+      'NAME' : 'ppapi_cpp_private',
+      'TYPE' : 'lib',
+      'SOURCES' : [
+          'ext_crx_file_system_private.cc',
+          'host_resolver_private.cc',
+          'net_address_private.cc',
+          'tcp_socket_private.cc',
+          'tcp_server_socket_private.cc',
+          'udp_socket_private.cc',
+          'x509_certificate_private.cc',
+      ],
+    }
+  ],
+  'DEST': 'src',
+  'NAME': 'ppapi_cpp_private',
+}
+