commit 4c9527b3147fb42d2548a0fdf796d2b66f0f68a7
author Tao Bao <tbao@google.com> Wed Aug 07 18:49:20 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 07 18:49:20 2019 +0000
tree bcf994100865818869e6d2f53912808d685a6ccb
parent 3738f37e22672483f2bcc0d684c8577dedb8a1d1
parent e11a46000c0ec099ffdd747a22c191885aedb6da

Merge "Move make_recovery_path and sparse_img to modules."

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

tools/releasetools/merge_target_files.py

diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 81b95c8..cfffbc7 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -94,7 +94,6 @@
 logger = logging.getLogger(__name__)
 
 OPTIONS = common.OPTIONS
-OPTIONS.verbose = True
 OPTIONS.framework_target_files = None
 OPTIONS.framework_item_list = None
 OPTIONS.framework_misc_info_keys = None
@@ -1057,6 +1056,9 @@
     common.Usage(__doc__)
     sys.exit(1)
 
+  # Always turn on verbose logging.
+  OPTIONS.verbose = True
+
   if OPTIONS.framework_item_list:
     framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
   else: