[NaCl SDK] .dsc files copy public headers, add ppapi_cpp dev sources

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 24 matching lines @@
 import build_projects
 import build_updater
 import build_version
 import generate_make
 import generate_notice
 import manifest_util
 import parse_dsc
 import verify_filelist
 
 from build_paths import SCRIPT_DIR, SDK_SRC_DIR, SRC_DIR, NACL_DIR, OUT_DIR
-from build_paths import PPAPI_DIR, NACLPORTS_DIR, GSTORE
+from build_paths import NACLPORTS_DIR, GSTORE
 
 # Add SDK make tools scripts to the python path.
 sys.path.append(os.path.join(SDK_SRC_DIR, 'tools'))
 sys.path.append(os.path.join(NACL_DIR, 'build'))
 
 import getos
 import oshelpers
 
 CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
 
@@ skipping 211 matching lines @@
       ('src/untrusted/irt/irt_ppapi.h', ''),
       ('src/untrusted/nacl/nacl_dyncode.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_startup.h', 'nacl/'),
       ('src/untrusted/nacl/nacl_thread.h', 'nacl/'),
       ('src/untrusted/nacl/pnacl.h', ''),
       ('src/untrusted/valgrind/dynamic_annotations.h', 'nacl/'),
   ],
   'host': []
 }
 
-# Source relative to 'ppapi' foler.  Destiniation relative
-# to SDK include folder.
-PPAPI_HEADER_MAP = [
-  # Copy the KHR headers
-  ('lib/gl/include/KHR/khrplatform.h',     'KHR/'),
-
-  # Copy the GLES2 headers
-  ('lib/gl/include/GLES2/gl2.h',           'GLES2/'),
-  ('lib/gl/include/GLES2/gl2ext.h',        'GLES2/'),
-  ('lib/gl/include/GLES2/gl2platform.h',   'GLES2/'),
-
-  # Copy the EGL headers
-  ('lib/gl/include/EGL/egl.h',             'EGL/'),
-  ('lib/gl/include/EGL/eglext.h',          'EGL/'),
-  ('lib/gl/include/EGL/eglplatform.h',     'EGL/'),
-
-  # Copy in the gles2 headers
-  ('lib/gl/gles2/gl2ext_ppapi.h',          'ppapi/gles2/'),
-  # Create a duplicate copy of this header
-  # TODO(sbc), remove this copy once we find a way to build gl2ext_ppapi.c.
-  ('lib/gl/gles2/gl2ext_ppapi.h',          'ppapi/lib/gl/gles2/'),
-
-  # Copy in the C++ headers
-  ('utility/graphics/paint_aggregator.h',  'ppapi/utility/graphics/'),
-  ('utility/graphics/paint_manager.h',     'ppapi/utility/graphics/'),
-  ('utility/threading/lock.h',             'ppapi/utility/threading/'),
-  ('utility/threading/simple_thread.h',    'ppapi/utility/threading/'),
-  ('utility/websocket/websocket_api.h',    'ppapi/utility/websocket/'),
-  ('utility/completion_callback_factory.h','ppapi/utility/'),
-  ('utility/completion_callback_factory_thread_traits.h', 'ppapi/utility/'),
-
-  # Copy in c, c/dev and c/extensions/dev headers
-  # TODO(sbc): remove the use of wildcards here so that we can more
-  # tightly control what ends up in the SDK.
-  ('c/*.h',                  'ppapi/c/'),
-  ('c/dev/*.h',              'ppapi/c/dev/'),
-  ('c/extensions/dev/*.h',   'ppapi/c/extensions/dev/'),
-
-  # Copy in cpp, cpp/dev, cpp/extensions/, cpp/extensions/dev
-  ('cpp/*.h',                'ppapi/cpp/'),
-  ('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/file_io_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/pass_file_handle.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/pp_file_handle.h', 'ppapi/c/private/'),
-  ('c/private/ppb_ext_crx_file_system_private.h', 'ppapi/c/private/'),
-  ('c/private/ppb_file_io_private.h', 'ppapi/c/private/'),
-  ('c/private/ppb_file_ref_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/'),
-]
-
-
-def InstallCommonHeaders(inc_path):
-  InstallFiles(PPAPI_DIR, inc_path, PPAPI_HEADER_MAP)
-
-
 def InstallFiles(src_root, dest_root, file_list):
   """Copy a set of files from src_root to dest_root according
   to the given mapping.  This allows files to be copied from
   to a location in the destination tree that is different to the
   location in the source tree.
 
   If the destination mapping ends with a '/' then the destination
   basename is inherited from the the source file.
 
   Wildcards can be used in the source list but it is not recommended
@@ skipping 630 matching lines @@
 
   BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
   BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
 
   if not options.skip_toolchain:
     BuildStepDownloadToolchains()
     BuildStepUntarToolchains(pepperdir, platform, arch, toolchains)
 
   BuildStepCopyTextFiles(pepperdir, pepper_ver, clnumber)
   BuildStepBuildToolchains(pepperdir, platform, toolchains)
-  InstallCommonHeaders(os.path.join(pepperdir, 'include'))
 
   BuildStepUpdateHelpers(pepperdir, platform, True)
   BuildStepUpdateUserProjects(pepperdir, platform, toolchains,
                               options.build_experimental, True)
 
   # Ship with libraries prebuilt, so run that first.
   BuildStepBuildLibraries(pepperdir, platform, 'src')
   GenerateNotice(pepperdir)
 
   # Verify the SDK contains what we expect.
@@ skipping 17 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')