X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.profile.d%2Fgoogle.sh;h=2496b58811f316a580eedf15f1035bc65caec16d;hb=HEAD;hp=1286eca951dd067b53b836c312eb61ce53c1effb;hpb=364c4d242188756f440293f0cd91ce96f096cf3c;p=home.git

diff --git a/.profile.d/google.sh b/.profile.d/google.sh
index 1286eca..f4d9025 100644
--- a/.profile.d/google.sh
+++ b/.profile.d/google.sh
@@ -1,7 +1,9 @@
 if [ -d ~/depot_tools ] ; then
-	path_prepend "`echo ~`/depot_tools"
-else
-	path_prepend "`echo ~`/chromiumos/depot_tools"
+	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"
@@ -10,6 +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"
 
-(printf "chromebox: 3000\r\n\r\n" | nc localhost 1817 >/dev/null 2>&1 &)
+alias copybara='/google/data/ro/teams/copybara/copybara'