[NaCl SDK] Roll naclports 1152 -> 1226.

* This makes the LICENSE file change work (see r263747); the output path has
  changed recently.

No trybots because the naclports builds only on the main waterfall.

r1226 | Shard mac builds now that we have more builders.
r1225 | libgit2 compiles and links for newlib, with glibc-compat changes.
r1224 | openal: Disable use of cpuid.h on i686
r1223 | switch openssh to use naclspawn
r1222 | Add --verbose-build option to naclports.py.
r1221 | Add libgit2 v0.20.0.
r1220 | Update openal-soft version.
r1219 | Remove use of legacy NACL_GLIBC variable.
r1218 | Don't create PUBLISH_DIR for each port.
r1217 | Adding debugging extension.
r1216 | Rename hterm to libapps in third_party
r1215 | Fixing pnacl bochs build.
r1214 | Fix linking issues with DevIL and PNaCl.
r1213 | Upload openssl to 1.0.1g
r1212 | Update bochs to 2.6.2 and make it load again.
r1211 | Consistent default values for NACL_ARCH and TOOLCHAIN.
r1210 | Refactoring to support tests of debug extension.
r1209 | Fix bochs PNaCl build mac
r1208 | Fixing gdb build on mac.
r1207 | Rename demos so they have more meaningful names.
r1206 | Fix sdk bundle buildbot.
r1205 | Fix typo in buildbot_sdk_bundle.sh
r1204 | Rename demos so they have more meaningful names.
r1203 | Add initial support for the bionic NaCl toolchain.
r1202 | Enable gdb_test.py on the bots.
r1201 | Fixing messed up quotes introduced in emacs patch.
r1200 | Avoid linuxism in build for emacs, enable for x86-64 mac.
r1199 | Switching to a promise pattern for onMessage.
r1198 | Make downloading and unzipping processes quieter.
r1197 | Enable ARM builds for libthoera and bullet.
r1196 | On non-windows OSes, use process groups to be sure we can kill Chrome.
r1195 | Fix sdk bundle builder to handle new package file names.
r1194 | Rename buildbot related scripts so that all start with buildbot_.
r1193 | Split package NAME and VERSION into two fields in pkg_info.
r1192 | Switching to using Javascript Promises.
r1191 | export NACL_SDK_ROOT in buildbot_selector.sh
r1190 | Fix bash syntax typo
r1189 | Fix the sdk-bundle buildbot.
r1188 | Try to get emacs building
r1187 | Rename ports that include underscore in their name.
r1186 | Use new nacl_io exit dance.
r1185 | Disable mesagl demo until create_html.py is fixed in the SDK
r1184 | Switch httpd and chrome_test to use built-in shutdown.
r1183 | Fix tinyxml install step.
r1182 | Pass test extension via user agent and make messaging more interlocked.
r1181 | Fix a few packages that were still not installing to DESTDIR.
r1180 | clapack: create DESTDIR_LIBDIR before copying to it
r1179 | Fix agg build.sh script so it installs to DESTDIR
r1178 | Converting gdb into a background only app.
r1177 | buildbot: Add missing bzip2 to partition 0 of 3
r1176 | Initial implementation of binary package system.
r1175 | Fixing gdb slow start and dropping nethack specific code.
r1174 | Don't skip the STRIP command in lua_ppapi.
r1173 | Add gtest style filters to chrome_test, multiple test dirs, and refactor TEST() macro.
r1172 | Adding timeout before begining test interaction with extensions.
r1171 | Ignore utility processes and fix linux-sdk bot.
r1170 | Actually turn on plumbing_tests.
r1169 | Fix race condition in chrome_test, re-enable chrome_test tests on the bots.
r1168 | Require tests to close all open test extension connections.
r1167 | Adding an extension testing framework.
r1166 | Fix mimetype in dosbox.html when building with PNaCl.
r1165 | Fix sed calls to be mac compatible
r1164 | Fix for undefined variable error on linux-sdk bot.
r1163 | Fix buildbot upload location.
r1162 | Use 'git number' in folder name when uploading results from buildbot.
r1161 | Remove gtest from DEPS
r1160 | flac: Add missing glibc-compat dependency.
r1159 | Set AR_FLAGS to 'cr' to avoid autotools default of 'cru'.
r1158 | drawing-demo: Add dependency on agg.
r1157 | Add final summary step to buildbot.
r1156 | Resurrect old AGG drawing demo.
r1155 | dosbox: Fix PNaCl mac build.
r1154 | Fixed bash memory issue and make mingn and bash work as an extension.
r1153 | Fix agg build. /usr/include/freetype2 needs to be included explicitly.

BUG=329304
R=sbc@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/239303005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263939 0039d316-1c4b-4281-b951-d872f2087c98

native_client_sdk/src/build_tools/build_sdk.py

@@ -53,7 +53,7 @@
 CYGTAR = os.path.join(NACL_DIR, 'build', 'cygtar.py')
 
 NACLPORTS_URL = 'https://naclports.googlecode.com/svn/trunk/src'
-NACLPORTS_REV = 1152
+NACLPORTS_REV = 1226
 
 GYPBUILD_DIR = 'gypbuild'
 
@@ -866,8 +866,9 @@ def BuildStepBuildNaClPorts(pepper_ver, pepperdir):
   env['PEPPER_DIR'] = os.path.basename(pepperdir)  # pepper_NN
   env['NACLPORTS_NO_ANNOTATE'] = "1"
   env['NACLPORTS_NO_UPLOAD'] = "1"
+  env['BUILDBOT_GOT_REVISION'] = str(NACLPORTS_REV)
 
-  build_script = 'build_tools/naclports-linux-sdk-bundle.sh'
+  build_script = 'build_tools/buildbot_sdk_bundle.sh'
   buildbot_common.BuildStep('Build naclports')
 
   bundle_dir = os.path.join(NACLPORTS_DIR, 'out', 'sdk_bundle')