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

Commit 5c1131b6 authored by Dan Albert's avatar Dan Albert Committed by Automerger Merge Worker
Browse files

Merge "Update PYTHONPATH for adb.py restructuring." am: ce9ea1db 

Original change: https://android-review.googlesource.com/c/platform/build/+/2403120



Change-Id: I1a4719a018650b3b46f33130a7f8c0b658e9dbdd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff9d0533 ce9ea1db

envsetup.sh

+16 −1
Original line number Diff line number Diff line
@@ -297,7 +297,22 @@ function set_lunch_paths() 
    if [ -n $ANDROID_PYTHONPATH ]; then

        export PYTHONPATH=${PYTHONPATH//$ANDROID_PYTHONPATH/}

    fi

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

    # //development/python-packages contains both a pseudo-PYTHONPATH which

    # mimics an already assembled venv, but also contains real Python packages

    # that are not in that layout until they are installed. We can fake it for

    # the latter type by adding the package source directories to the PYTHONPATH

    # directly. For the former group, we only need to add the python-packages

    # directory itself.

    #

    # This could be cleaned up by converting the remaining packages that are in

    # the first category into a typical python source layout (that is, another

    # layer of directory nesting) and automatically adding all subdirectories of

    # python-packages to the PYTHONPATH instead of manually curating this. We

    # can't convert the packages like adb to the other style because doing so

    # would prevent exporting type info from those packages.

    #

    # http://b/266688086

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

    if [ -n $VENDOR_PYTHONPATH ]; then

        ANDROID_PYTHONPATH=$ANDROID_PYTHONPATH$VENDOR_PYTHONPATH

    fi