[NaCl SDK] Add arm-nacl-clang support to the 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 430 matching lines @@
       ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
       ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
       ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'],
       ['nonsfi_loader_newlib_arm_nonsfi.nexe', 'nonsfi_loader_arm'],
       ['sel_ldr', 'sel_ldr_arm']
     ]
     InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files)
 
   for tc in set(toolchains) & set(['newlib', 'glibc', 'pnacl']):
     if tc == 'pnacl':
-      xarches = (None, 'ia32', 'x64')
+      xarches = (None, 'ia32', 'x64', 'arm')
     elif tc == 'glibc':
       xarches = ('ia32', 'x64')
     else:
       xarches = ('arm', 'ia32', 'x64')
 
     for xarch in xarches:
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[tc])
 
@@ skipping 14 matching lines @@
 #  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
   out_dir_32 = MakeNinjaRelPath(rel_out_dir + '-ia32')
   out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-x64')
   out_dir_arm = MakeNinjaRelPath(rel_out_dir + '-arm')
   out_dir_clang_32 = MakeNinjaRelPath(rel_out_dir + '-clang-ia32')
   out_dir_clang_64 = MakeNinjaRelPath(rel_out_dir + '-clang-x64')
+  out_dir_clang_arm = MakeNinjaRelPath(rel_out_dir + '-clang-arm')
 
   GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_32)
   GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_64)
+  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm)
   GypNinjaBuild('ia32', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
       out_dir_clang_32, gyp_defines=['use_nacl_clang=1'])
   GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
       out_dir_clang_64, gyp_defines=['use_nacl_clang=1'])
-  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk', out_dir_arm)
+  GypNinjaBuild('arm', gyp_py, nacl_core_sdk_gyp, 'nacl_core_sdk',
+      out_dir_clang_arm, gyp_defines=['use_nacl_clang=1'])
   GypNinjaBuild('x64', gyp_py, all_gyp, 'ncval_new', out_dir_64)
 
 
 def GypNinjaBuild_Breakpad(rel_out_dir):
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if getos.GetPlatform() == 'win':
     return
 
   gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
@@ skipping 85 matching lines @@
       GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64')
 
     if 'arm' in toolchains:
       GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm')
 
     if 'pnacl' in toolchains:
       GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-clang-ia32',
                           ['use_nacl_clang=1'])
       GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-clang-x64',
                           ['use_nacl_clang=1'])
+      GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-clang-arm',
+                          ['use_nacl_clang=1'])
 
       # NOTE: For ia32, gyp builds both x86-32 and x86-64 by default.
       for arch in ('ia32', 'arm'):
         # Fill in the latest native pnacl shim library from the chrome build.
         build_dir = GYPBUILD_DIR + '-pnacl-' + arch
         GypNinjaBuild_Pnacl(build_dir, arch)
 
   GypNinjaInstall(pepperdir, toolchains)
 
   platform = getos.GetPlatform()
@@ skipping 42 matching lines @@
                                     pnacl_translator_lib_dir)
 
         buildbot_common.CopyFile(
             os.path.join(release_build_dir, 'libpnacl_irt_shim.a'),
             pnacl_translator_lib_dir)
 
     InstallNaClHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'pnacl'),
                        'pnacl')
     InstallNaClHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'),
                        'pnacl')
+    InstallNaClHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'arm'),
+                       'pnacl')
 
 
 def MakeDirectoryOrClobber(pepperdir, dirname, clobber):
   dirpath = os.path.join(pepperdir, dirname)
   if clobber:
     buildbot_common.RemoveDir(dirpath)
   buildbot_common.MakeDir(dirpath)
 
   return dirpath
 
@@ skipping 428 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')