enter_chroot: bind mount depot_tools if present outside chroot.

src/scripts/enter_chroot.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to enter the chroot environment
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 45 matching lines @@
    CHROMEOS_OFFICIAL=1
 fi
 
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 # TODO: replace shflags with something less error-prone, or contribute a fix.
 set -e
 
 INNER_CHROME_ROOT="/home/$USER/chrome_root"  # inside chroot
 CHROME_ROOT_CONFIG="/var/cache/chrome_root"  # inside chroot
+INNER_DEPOT_TOOLS_ROOT="/home/$USER/depot_tools"  # inside chroot
 
 sudo chmod 0777 "$FLAGS_chroot/var/lock"
 
 LOCKFILE="$FLAGS_chroot/var/lock/enter_chroot"
 
 function setup_env {
   (
     flock 200
     echo $$ >> "$LOCKFILE"
 
@@ skipping 30 matching lines @@
         echo "Not mounting chrome source"
         sudo rm -f "${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
       else
         echo "Mounting chrome source at: $INNER_CHROME_ROOT"
         echo "$CHROME_ROOT" | \
           sudo dd of="${FLAGS_chroot}${CHROME_ROOT_CONFIG}"
         mkdir -p "$MOUNTED_PATH"
         sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH"
       fi
     fi
+
+    MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_DEPOT_TOOLS_ROOT}")"
+    if [ -z "$(mount | grep -F "on $MOUNTED_PATH")" ]
+    then
+      if [ $(which gclient 2>/dev/null) ]; then
+        echo "Mounting depot_tools"
+        DEPOT_TOOLS=$(dirname $(which gclient) )
+        mkdir -p "$MOUNTED_PATH"
+        sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH"
+      fi
+    fi
   ) 200>>"$LOCKFILE"
 }
 
 function teardown_env {
   # Only teardown if we're the last enter_chroot to die
 
   (
     flock 200
 
     # check each pid in $LOCKFILE to see if it's died unexpectedly
@@ skipping 77 matching lines @@
 
 # Run command or interactive shell.  Also include the non-chrooted path to
 # the source trunk for scripts that may need to print it (e.g.
 # build_image.sh).
 sudo chroot "$FLAGS_chroot" sudo -i -u $USER $CHROOT_PASSTHRU \
   EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" LANG=C "$@"
 
 # Remove trap and explicitly unmount
 trap - EXIT
 teardown_env