diff --git a/envsetup.sh b/envsetup.sh
index b3066a9..7dcff6f 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -305,7 +305,6 @@
     setpaths
     set_sequence_number
 
-    export ANDROID_BUILD_TOP=$(gettop)
     # With this environment variable new GCC can apply colors to warnings/errors
     export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
     export ASAN_OPTIONS=detect_leaks=0
@@ -1669,3 +1668,5 @@
 unset f
 
 addcompletions
+
+export ANDROID_BUILD_TOP=$(gettop)