X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.profile.d%2Fgoogle.sh;h=45d300f732ab96240ecec6c5c59339c763892e2a;hb=853a0c1f76ed7cb7e9bd6619b9e58b38cca1a1f0;hp=5a5c3702abf6e4c3bdfce7ef201b687a31985d5b;hpb=9f2be41349ca069918cde9e724e4f6f70497be02;p=home.git diff --git a/.profile.d/google.sh b/.profile.d/google.sh index 5a5c370..45d300f 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 "`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,7 @@ fi export CROSTOOLS_SKIP_SYNC="true" export CROSTOOLS_GSUTIL="gsutil" +export P4DIFF="vapier-diff" +export G4MULTIDIFF="0" export P4DIFFOPTS="-du" - -(printf "chromebox: 3000\r\n\r\n" | nc localhost 1817 >/dev/null) & +export ANDROID_USE_AMAKE="true"