Add "libraries" directory to SDK

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 224 matching lines @@
   'glibc': {
       'nacl/dynamic_annotations.h':
           'src/untrusted/valgrind/dynamic_annotations.h',
       'nacl/nacl_dyncode.h': 'src/untrusted/nacl/nacl_dyncode.h',
       'nacl/nacl_startup.h': 'src/untrusted/nacl/nacl_startup.h',
       'nacl/nacl_thread.h': 'src/untrusted/nacl/nacl_thread.h',
       'pnacl.h': 'src/untrusted/nacl/pnacl.h',
       'irt.h': 'src/untrusted/irt/irt.h',
       'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h',
   },
+  'libs': {
+  },
 }
 
 
 def InstallHeaders(tc_dst_inc, pepper_ver, tc_name):
   """Copies NaCl headers to expected locations in the toolchain."""
   tc_map = HEADER_MAP[tc_name]
   for filename in tc_map:
     src = os.path.join(NACL_DIR, tc_map[filename])
     dst = os.path.join(tc_dst_inc, filename)
     buildbot_common.MakeDir(os.path.dirname(dst))
@@ skipping 353 matching lines @@
     buildbot_common.BuildStep('Rerun hooks to get toolchains')
     buildbot_common.Run(['gclient', 'runhooks'],
                         cwd=SRC_DIR, shell=(platform=='win'))
 
   buildbot_common.BuildStep('Clean Pepper Dirs')
   pepperdir = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_ver)
   pepperold = os.path.join(SRC_DIR, 'out', 'pepper_' + pepper_old)
   buildbot_common.RemoveDir(pepperold)
   if not skip_untar:
     buildbot_common.RemoveDir(pepperdir)
+    buildbot_common.MakeDir(os.path.join(pepperdir, 'libraries'))
     buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain'))
     buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
   else:
     buildbot_common.MakeDir(pepperdir)
 
   if not skip_build:
     buildbot_common.BuildStep('Add Text Files')
     files = ['AUTHORS', 'COPYING', 'LICENSE', 'NOTICE', 'README']
     files = [os.path.join(SDK_SRC_DIR, filename) for filename in files]
     oshelpers.Copy(['-v'] + files + [pepperdir])
 
 
   # Clean out the temporary toolchain untar directory
   if not skip_untar:
     UntarToolchains(pepperdir, platform, arch, toolchains)
 
   if not skip_build:
     BuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains)
+    InstallHeaders(os.path.join(pepperdir, 'libraries'), pepper_ver, 'libs')
 
   if not skip_build:
     buildbot_common.BuildStep('Copy make OS helpers')
     buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.py'),
         os.path.join(pepperdir, 'tools'))
     if platform == 'win':
       buildbot_common.BuildStep('Add MAKE')
       http_download.HttpDownload(GSTORE + MAKE,
                                  os.path.join(pepperdir, 'tools' ,'make.exe'))
       rename_list = ['ncval_x86_32', 'ncval_x86_64',
@@ skipping 15 matching lines @@
   if not skip_tar:
     buildbot_common.BuildStep('Tar Pepper Bundle')
     buildbot_common.Run([sys.executable, CYGTAR, '-C', OUT_DIR, '-cjf', tarfile,
          'pepper_' + pepper_ver], cwd=NACL_DIR)
 
   # build sdk update
   if not skip_update:
     BuildUpdater()
 
   # start local server sharing a manifest + the new bundle
-  if not skip_test_updater:
+  if not skip_test_updater and not skip_tar:
     buildbot_common.BuildStep('Move bundle to localserver dir')
     buildbot_common.MakeDir(SERVER_DIR)
     buildbot_common.Move(tarfile, SERVER_DIR)
     tarfile = os.path.join(SERVER_DIR, tarname)
 
     server = None
     try:
       buildbot_common.BuildStep('Run local server')
       server = LocalHTTPServer(SERVER_DIR)
 
@@ skipping 73 matching lines @@
         manifest_snippet_stream.write(bundle.GetDataAsString())
 
       buildbot_common.Archive(tarname + '.json', bucket_path, OUT_DIR,
                               step_link=False)
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))