ddnuke: switch errp to err.h

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

diff --git a/.profile.d/google.sh b/.profile.d/google.sh
index 1185659bdcae256e1b75bf4558838cccaf844c9b..e44e506d4f3fff9b60b20828f48f9e42c5c3f591 100644 (file)
--- 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"
@@ -11,3 +13,4 @@ fi
 export CROSTOOLS_SKIP_SYNC="true"
 export CROSTOOLS_GSUTIL="gsutil"
 export P4DIFFOPTS="-du"
+export ANDROID_USE_AMAKE="true"