diff --git a/envsetup.sh b/envsetup.sh
index 62802df6d..3c29e8885 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -198,6 +198,7 @@ function setpaths()
     fi
 
     export PATH=$ANDROID_BUILD_PATHS$PATH
+    export PYTHONPATH=$T/system/core:$PYTHONPATH
 
     unset ANDROID_JAVA_TOOLCHAIN
     unset ANDROID_PRE_BUILD_PATHS