X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.profile.d%2Fgoogle.sh;h=2496b58811f316a580eedf15f1035bc65caec16d;hb=f7555918c8180c281c91caec2cb5f7990e1719bb;hp=c8cd4ab28f458347a3aeda1c60b9299bf0326dc3;hpb=c2df3f79eb8c0f75644e80af4663af0eea51ab4a;p=home.git

diff --git a/.profile.d/google.sh b/.profile.d/google.sh
index c8cd4ab..2496b58 100644
--- 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 "`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'