[NaCl SDk] Update naclports revision used to build 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 39 matching lines @@
 import oshelpers
 
 BUILD_DIR = os.path.join(NACL_DIR, 'build')
 NACL_TOOLCHAIN_DIR = os.path.join(NACL_DIR, 'toolchain')
 NACL_TOOLCHAINTARS_DIR = os.path.join(NACL_TOOLCHAIN_DIR, '.tars')
 
 CYGTAR = os.path.join(BUILD_DIR, 'cygtar.py')
 PKGVER = os.path.join(BUILD_DIR, 'package_version', 'package_version.py')
 
 NACLPORTS_URL = 'https://chromium.googlesource.com/external/naclports.git'
-NACLPORTS_REV = '873ca4910a5f9d4206306aacb4ed79c587c6a5f3'
+NACLPORTS_REV = '796184d48c27d65f48638a51ae144d651cd9f90d'
 
 GYPBUILD_DIR = 'gypbuild'
 
 options = None
 
 # Map of: ToolchainName: (PackageName, SDKDir).
 TOOLCHAIN_PACKAGE_MAP = {
     'newlib': ('nacl_x86_newlib', '%(platform)s_x86_newlib'),
     'bionic': ('nacl_arm_bionic', '%(platform)s_arm_bionic'),
     'arm': ('nacl_arm_newlib', '%(platform)s_arm_newlib'),
@@ skipping 884 matching lines @@
 
     # Get head version of NativeClient tree
     buildbot_common.BuildStep('Build bionic toolchain.')
     buildbot_common.Run([sys.executable, 'toolchain_build_bionic.py', '-f'],
                         cwd=toolchain_build)
   else:
     toolchain_build = None
 
   if buildbot_common.IsSDKBuilder():
     options.archive = True
-    options.build_ports = True
-    # TODO(binji): re-enable app_engine build when the linux builder stops
-    # breaking when trying to git clone from github.
-    # See http://crbug.com/412969.
-    options.build_app_engine = False
     options.tar = True
 
+  options.build_ports = True
+  options.build_app_engine = True

[binji, 2014/11/11 22:25:13]

we can try re-enabling this, but I'd rather do it in another CL.

[Sam Clegg, 2014/11/11 22:57:50]

Sorry, should have said.  Not going to land this part of the CL.  This one is
just to the trybot runs all this stuff.

+
   # NOTE: order matters here. This will be the order that is specified in the
   # Makefiles; the first toolchain will be the default.
   toolchains = ['pnacl', 'newlib', 'glibc', 'arm', 'host']
 
   # Changes for experimental bionic builder
   if options.bionic:
     toolchains.append('bionic')
     options.build_ports = False
     options.build_app_engine = False
 
@@ skipping 82 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')