cros-board: update

[home.git] / .profile.d / google.sh

diff --git a/.profile.d/google.sh b/.profile.d/google.sh
index c8cd4ab28f458347a3aeda1c60b9299bf0326dc3..f4d9025db4834325c0cf1f8e8f98eb2a5b0e258a 100644 (file)
--- a/.profile.d/google.sh
+++ b/.profile.d/google.sh
@@ -1,4 +1,10 @@
-path_prepend "`echo ~`/chromiumos/depot_tools"
+if [ -d ~/depot_tools ] ; then
+       path_append "$(realpath "`echo ~`/depot_tools")"
+elif [ -d ~/chromiumos/depot_tools ] ; then
+       path_append "`echo ~`/chromiumos/depot_tools"
+elif [ -d ~/chromiumos/chromium/tools/depot_tools ] ; then
+       path_append "`echo ~`/chromiumos/chromium/tools/depot_tools"
+fi
 if [ -d ~/gentoo ] ; then
        export EPREFIX="$HOME/gentoo"
        path_append "$EPREFIX/usr/bin"
@@ -6,4 +12,9 @@ fi
 
 export CROSTOOLS_SKIP_SYNC="true"
 export CROSTOOLS_GSUTIL="gsutil"
+export P4DIFF="vapier-diff"
+export G4MULTIDIFF="0"
 export P4DIFFOPTS="-du"
+export ANDROID_USE_AMAKE="true"
+
+alias copybara='/google/data/ro/teams/copybara/copybara'