Remove GYP build from bots and 'gclient runhooks'

buildbot/buildbot_pnacl.sh

 #!/bin/bash
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -o xtrace
 set -o nounset
 set -o errexit
 
 # Tell build.sh and test.sh that we're a bot.
 export PNACL_BUILDBOT=true
 # Make TC bots print all log output to console (this variable only affects
 # build.sh output)
 export PNACL_VERBOSE=true
 
-# This affects trusted components of gyp and scons builds.
+# This affects trusted components of scons builds.
 # The setting OPT reuslts in optimized/release trusted executables,
 # the setting DEBUG results in unoptimized/debug trusted executables
 BUILD_MODE_HOST=OPT
 # If true, terminate script when first scons error is encountered.
 FAIL_FAST=${FAIL_FAST:-true}
 # This remembers when any build steps failed, but we ended up continuing.
 RETCODE=0
 
 readonly UP_DOWN_LOAD="buildbot/file_up_down_load.sh"
 # This script is used by toolchain bots (i.e. tc-xxx functions)
@@ skipping 77 matching lines @@
     ${UP_DOWN_LOAD} DownloadArmBinariesForHWBotsTry ${name} arm-scons.tgz
   else
     ${UP_DOWN_LOAD} DownloadArmBinariesForHWBots ${name} arm-scons.tgz
   fi
 
   echo "@@@BUILD_STEP untar_binaries@@@"
   rm -rf scons-out/
   tar xvfz arm-scons.tgz --no-same-owner
 }
 
-# Build with gyp - this only exercises the trusted TC and hence this only
-# makes sense to run for ARM.
-gyp-arm-build() {
-  local gypmode="Release"
-  if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
-    gypmode="Debug"
-  fi
-
-  echo "@@@BUILD_STEP gyp_configure [${gypmode}]@@@"
-  # Setup environment for arm.
-  export GYP_DEFINES="target_arch=arm"
-  export GYP_CROSSCOMPILE=1
-  # NOTE: gclient runhooks and gyp_nacl use the exported env vars so we have to
-  # run it again
-  gclient runhooks
-
-  echo "@@@BUILD_STEP gyp_compile [${gypmode}]@@@"
-  ninja -C ../out/${gypmode} -v
-}
-
-# Build with gyp for MIPS.
-gyp-mips32-build() {
-  local gypmode="Release"
-  if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
-    gypmode="Debug"
-  fi
-
-  # Ensure the trusted mips toolchain is installed.
-  build/package_version/package_version.py \
-      --packages linux_x86/mips_trusted sync -x
-
-  echo "@@@BUILD_STEP gyp_configure [${gypmode}]@@@"
-  # Add mipsel-linux-gnu-gcc tools to the PATH
-  export PATH=$PATH:$PWD/toolchain/linux_x86/mips_trusted/bin/
-  export GYP_DEFINES="target_arch=mipsel"
-  export GYP_CROSSCOMPILE=1
-  # NOTE: gclient runhooks and gyp_nacl use the exported env vars so we have to
-  # run it again
-  gclient runhooks
-
-  echo "@@@BUILD_STEP gyp_compile [${gypmode}]@@@"
-  ninja -C ../out/${gypmode} -v
-}
-
 # QEMU upload bot runs this function, and the hardware download bot runs
 # mode-buildbot-arm-hw
 mode-buildbot-arm() {
   clobber
 
-  gyp-arm-build
-
   # Don't run the tests on qemu, only build them.
   # QEMU is too flaky for the main waterfall
   local mode
   if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
     mode="dbg"
   else
     mode="opt"
   fi
   buildbot/buildbot_pnacl.py --skip-run ${mode} arm pnacl
 }
 
 mode-buildbot-arm-hw() {
   local mode
   if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
     mode="dbg"
   else
     mode="opt"
   fi
   buildbot/buildbot_pnacl.py --skip-build ${mode} arm pnacl
 }
 
 mode-trybot-qemu() {
   clobber
   local arch=$1
-  # TODO(dschuff): move the gyp build to buildbot_pnacl.py
-  if [[ ${arch} == "arm" ]] ; then
-    gyp-arm-build
-  elif [[ ${arch} == "mips32" ]] ; then
-    gyp-mips32-build
-  fi
 
   buildbot/buildbot_pnacl.py opt $arch pnacl
 }
 
 mode-buildbot-arm-dbg() {
   BUILD_MODE_HOST=DEDUG
   mode-buildbot-arm
   archive-for-hw-bots $(NAME_ARM_UPLOAD) regular
 }
 
@@ skipping 95 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi