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

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

Merge "Filter out VENDOR_PYTHONPATH from PYTHONPATH in aosp." am: 43109660 am: 284a48f6 

am: 23c85b37

Change-Id: Icb1cbd58e2e8f2826d1d57663df3bd9ff0173471
parents 9c592596 23c85b37

envsetup.sh

+4 −0
Original line number Diff line number Diff line
@@ -285,6 +285,9 @@ function setpaths() 
    fi

    # and in with the new

    export ANDROID_PYTHONPATH=$T/development/python-packages:

    if [ -n $VENDOR_PYTHONPATH  ]; then

        ANDROID_PYTHONPATH=$ANDROID_PYTHONPATH$VENDOR_PYTHONPATH

    fi

    export PYTHONPATH=$ANDROID_PYTHONPATH$PYTHONPATH



    export ANDROID_JAVA_HOME=$(get_abs_build_var ANDROID_JAVA_HOME)
@@ -1552,6 +1555,7 @@ function validate_current_shell() { 
#

# This allows loading only approved vendorsetup.sh files

function source_vendorsetup() {

    unset VENDOR_PYTHONPATH

    allowed=

    for f in $(find -L device vendor product -maxdepth 4 -name 'allowed-vendorsetup_sh-files' 2>/dev/null | sort); do

        if [ -n "$allowed" ]; then