Chromium Code Reviews| Index: native_client_sdk/src/build_tools/build_sdk.py |
| diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py |
| index cac1e0c61c6930e341afe0a1331a10654f0d5b42..0b7be99babb9ace6924cebf7f36312b960215750 100755 |
| --- a/native_client_sdk/src/build_tools/build_sdk.py |
| +++ b/native_client_sdk/src/build_tools/build_sdk.py |
| @@ -57,7 +57,7 @@ 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' |
| @@ -962,13 +962,11 @@ def main(args): |
| 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
Sam Clegg
2014/11/11 22:57:50
Sorry, should have said. Not going to land this p
|
| + |
| # 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'] |