[NaCl SDK] Compile for naclio for Bionic

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 350 matching lines @@
     tc_name = 'newlib'
 
   InstallFiles(SRC_DIR, tc_dst_inc, NACL_HEADER_MAP[tc_name])
 
 
 def MakeNinjaRelPath(path):
   return os.path.join(os.path.relpath(OUT_DIR, SRC_DIR), path)
 
 
 TOOLCHAIN_LIBS = {
+  'bionic' : [
+    'libminidump_generator.a',
+    'libnacl.a',
+    'libnacl_dyncode.a',
+    'libnacl_exception.a',
+    'libnacl_list_mappings.a',
+    'libppapi.a',
+    'libppapi_stub.a',
+  ],
   'newlib' : [
     'crti.o',
     'crtn.o',
     'libminidump_generator.a',
     'libnacl.a',
     'libnacl_dyncode.a',
     'libnacl_exception.a',
     'libnacl_list_mappings.a',
     'libnosys.a',
     'libppapi.a',
@@ skipping 60 matching lines @@
   buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
 
   # Add .exe extensions to all windows tools
   for pair in tools_files:
     if platform == 'win' and not pair[0].endswith('.nexe'):
       pair[0] += '.exe'
       pair[1] += '.exe'
 
   InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files)
 
+  # Add ARM binaries
+  tools_files = [
+    ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
+    ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe']
+  ]
+  if platform == 'linux':
+    tools_files.append(['sel_ldr', 'sel_ldr_arm'])
+    tools_files.append(['nacl_helper_bootstrap',
+                        'nacl_helper_bootstrap_arm'])
+  ninja_out_dir = os.path.join(OUT_DIR, build_dir + '-arm', 'Release')
+  InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files)
+
   for tc in set(toolchains) & set(['newlib', 'glibc', 'pnacl']):
     if tc == 'pnacl':
       xarches = (None,)
     else:
       xarches = ('arm', '32', '64')
 
     for xarch in xarches:
       if tc == 'glibc' and xarch == 'arm':
         continue
 
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[tc])
 
+      # Copy ARM newlib components to bionic
+      if tc == 'newlib' and xarch == 'arm' and 'bionic' in toolchains:
+        bionic_dir = GetOutputToolchainLib(pepperdir, 'bionic', xarch)
+        InstallFiles(src_dir, bionic_dir, TOOLCHAIN_LIBS['bionic'])
+
       if tc != 'pnacl':
         src_dir = GetGypToolchainLib(tc, xarch)
         InstallFiles(src_dir, dst_dir, ['crt1.o'])
 
 
 def GypNinjaBuild_NaCl(rel_out_dir):
   gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
@@ skipping 408 matching lines @@
   buildbot_common.BuildStep('Build GoNaCl AppEngine Projects')
   cmd = ['make', 'upload', 'REVISION=%s' % chrome_revision]
   env = dict(os.environ)
   env['NACL_SDK_ROOT'] = pepperdir
   env['NACLPORTS_NO_ANNOTATE'] = "1"
   buildbot_common.Run(cmd, env=env, cwd=GONACL_APPENGINE_SRC_DIR)
 
 
 def main(args):
   parser = optparse.OptionParser(description=__doc__)
+  parser.add_option('--qemu', help='Add qemu for ARM.',
+      action='store_true')
   parser.add_option('--bionic', help='Add bionic build.',
       action='store_true')
   parser.add_option('--tar', help='Force the tar step.',
       action='store_true')
   parser.add_option('--archive', help='Force the archive step.',
       action='store_true')
   parser.add_option('--gyp',
       help='Use gyp to build examples/libraries/Makefiles.',
       action='store_true')
   parser.add_option('--release', help='PPAPI release version.',
@@ skipping 85 matching lines @@
   if options.build_ports and getos.GetPlatform() == 'linux':
     ports_tarfile = os.path.join(OUT_DIR, 'naclports.tar.bz2')
     BuildStepSyncNaClPorts()
     BuildStepBuildNaClPorts(pepper_ver, pepperdir)
     if options.tar:
       BuildStepTarNaClPorts(pepper_ver, ports_tarfile)
 
   if options.build_app_engine and getos.GetPlatform() == 'linux':
     BuildStepBuildAppEngine(pepperdir, chrome_revision)
 
+  if options.qemu:
+    qemudir = os.path.join(NACL_DIR, 'toolchain', 'linux_arm-trusted')
+    oshelpers.Copy(['-r', qemudir, pepperdir])
+

[Sam Clegg, 2014/03/27 00:10:02]

I don't think you need to full folder here, just a few .so files that sel_ldr
needs... but we not shipping this so I guess its fine for now.

[noelallen1, 2014/03/27 18:13:48]

True, I will re-examine if/when we ship it.

   # Archive on non-trybots.
   if options.archive:
     BuildStepArchiveBundle('build', pepper_ver, chrome_revision, nacl_revision,
                            tarfile)
     if options.build_ports and getos.GetPlatform() == 'linux':
       BuildStepArchiveBundle('naclports', pepper_ver, chrome_revision,
                              nacl_revision, ports_tarfile)
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')
+