Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / native_client_sdk / src / build_tools / build_sdk.py

diff --git a/src/native_client_sdk/src/build_tools/build_sdk.py b/src/native_client_sdk/src/build_tools/build_sdk.py
index 0e24f60..d4e7f0c 100755 (executable)
--- a/src/native_client_sdk/src/build_tools/build_sdk.py
+++ b/src/native_client_sdk/src/build_tools/build_sdk.py
@@ -63,7 +63,7 @@ GYPBUILD_DIR = 'gypbuild'
 
 options = None
 
-  # Map of: ToolchainName: (PackageName, SDKDir).
+# Map of: ToolchainName: (PackageName, SDKDir).
 TOOLCHAIN_PACKAGE_MAP = {
     'newlib': ('nacl_x86_newlib', '%(platform)s_x86_newlib'),
     'bionic': ('nacl_arm_bionic', '%(platform)s_arm_bionic'),
@@ -406,7 +406,7 @@ def GypNinjaInstall(pepperdir, toolchains):
   InstallFiles(ninja_out_dir, os.path.join(pepperdir, 'tools'), tools_files)
 
   # Add ARM binaries
-  if platform == 'linux':
+  if platform == 'linux' and not options.no_arm_trusted:
     tools_files = [
       ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
       ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
@@ -500,7 +500,7 @@ def GypNinjaBuild_Pnacl(rel_out_dir, target_arch):
   out_dir = MakeNinjaRelPath(rel_out_dir)
   gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
                           'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
-  targets = ['shim_aot']
+  targets = ['aot']
   GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir, False)
 
 
@@ -525,6 +525,8 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets,
           'arm_float_abi=hard']
       if force_arm_gcc:
         gyp_defines.append('nacl_enable_arm_gcc=1')
+      if options.no_arm_trusted:
+        gyp_defines.append('disable_cross_trusted=1')
   if getos.GetPlatform() == 'mac':
     gyp_defines.append('clang=1')
 
@@ -888,6 +890,8 @@ def main(args):
       action='store_true')
   parser.add_option('--mac-sdk',
       help='Set the mac-sdk (e.g. 10.6) to use when building with ninja.')
+  parser.add_option('--no-arm-trusted', action='store_true',
+      help='Disable building of ARM trusted components (sel_ldr, etc).')
 
   # To setup bash completion for this command first install optcomplete
   # and then add this line to your .bashrc:
@@ -981,6 +985,7 @@ def main(args):
       oshelpers.Copy(['-r', srcdir, bionicdir])
     else:
       BuildStepUntarToolchains(pepperdir, toolchains)
+
     BuildStepBuildToolchains(pepperdir, toolchains)
 
   BuildStepUpdateHelpers(pepperdir, True)