From 22f4c322d63d19d392be689422be9e3e9c473410 Mon Sep 17 00:00:00 2001 From: Jim Tang Date: Mon, 17 Dec 2018 15:21:53 +0800 Subject: [PATCH] Prevent PYTHONPATH from accumulatively growing. After running "lunch" multiple times, the global variable PYTHONPATH grows larger and larger with repetively content. This patch is to prevent PYTHONPATH from prepending redundant path. Bug: b/121110600 Test: $ source build/envsetup.sh && lunch $ echo $PYTHONPATH | sed 's/:/\n/g' $ lunch; lunch $ echo $PYTHONPATH | sed 's/:/\n/g' # not growing. Change-Id: Ifc36d071fb63bb1494bb0a94fdff477a41708c74 --- envsetup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 561083d38c..44ae65939d 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -266,7 +266,14 @@ function setpaths() fi export PATH=$ANDROID_BUILD_PATHS$PATH - export PYTHONPATH=$T/development/python-packages:$PYTHONPATH + + # out with the duplicate old + if [ -n $ANDROID_PYTHONPATH ]; then + export PYTHONPATH=${PYTHONPATH//$ANDROID_PYTHONPATH/} + fi + # and in with the new + export 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