diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-08-15 15:56:37 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2020-08-15 15:56:37 +0200 |
| commit | 12c9691f26abdc954da9a1418b1a01bc3e23c7dd (patch) | |
| tree | 9973d1b007009a4870dc2f56182555c6a94cb121 | |
| parent | 6354000cbd3c3061a5d626e0f6d43077db31d06c (diff) | |
| download | build_make-history/28-08-2020.tar.gz build_make-history/28-08-2020.tar.bz2 build_make-history/28-08-2020.zip | |
Revert "Use the host python interpreter"history/28-08-2020
This reverts commit a1a9b453d442eb77bd12c29d1e8bf1ffedc9371e.
| -rw-r--r-- | envsetup.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index dd10e3e3aa..6384b3cc15 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -289,6 +289,15 @@ function setpaths() export PATH=$ANDROID_BUILD_PATHS$PATH + # out with the duplicate old + if [ -n $ANDROID_PYTHONPATH ]; then + export PYTHONPATH=${PYTHONPATH//$ANDROID_PYTHONPATH/} + fi + # and in with the new + export ANDROID_PYTHONPATH=$(python -c "import sys; print(':'.join(sys.path))"): + export ANDROID_PYTHONPATH=${ANDROID_PYTHONPATH}$T/development/python-packages: + export PYTHONPATH=$ANDROID_PYTHONPATH$PYTHONPATH + export ANDROID_JAVA_HOME=$(get_abs_build_var ANDROID_JAVA_HOME) export JAVA_HOME=$ANDROID_JAVA_HOME export ANDROID_JAVA_TOOLCHAIN=$(get_abs_build_var ANDROID_JAVA_TOOLCHAIN) @@ -331,7 +340,6 @@ function set_stuff_for_environment() # 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 - export TEMPORARY_DISABLE_PATH_RESTRICTIONS=true } function set_sequence_number() |