commit 3738f37e22672483f2bcc0d684c8577dedb8a1d1
author Tao Bao <tbao@google.com> Wed Aug 07 02:19:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 02:19:01 2019 +0000
tree 9e7af1b0d9ed9c152d448a9e40b2ced3b7dc75f2
parent 431096605c6a35a87b2bf8da1134c1f1e6c793b8
parent abb806b3f0836993946382564b03cef5a72d6486

Merge "releasetools: merge_target_files sets verbose in main."

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 9198ee5..0392e86 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -285,6 +285,9 @@
     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 @@
 #
 # 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