Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3090fb7 authored by Jim Tang's avatar Jim Tang Committed by android-build-merger
Browse files

Merge "Prevent PYTHONPATH from accumulatively growing." am: c0b701b2 am: 43ba3bb8 

am: 4a736925

Change-Id: I828fd8c4a2cb6638504ab35c884e3ef2b5dbe820
parents 73f220eb 4a736925

envsetup.sh

+8 −1
Original line number Diff line number Diff line
@@ -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