commit ce7c1016c507a441d3e5e39baef092b06fc00e8e
author Dan Albert <danalbert@google.com> Thu May 18 20:03:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 18 20:03:36 2023 +0000
tree 35f258835452c3f7861912b4aff1ed8029dac7a0
parent f18046a75946f4ba4d55375f545ec51e05dc4bb6
parent d230125270769b78c44164387eb03a478c050b4d

Merge "Adapt to gdbrunner packaging." am: d230125270

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

Change-Id: Ief01ae7d4cc5f62aa23f1a7aface65021073c507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index ef48249..d292dbb 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -312,7 +312,7 @@
     # would prevent exporting type info from those packages.
     #
     # http://b/266688086
-    export ANDROID_PYTHONPATH=$T/development/python-packages/adb:$T/development/python-packages:
+    export ANDROID_PYTHONPATH=$T/development/python-packages/adb:$T/development/python-packages/gdbrunner:$T/development/python-packages:
     if [ -n $VENDOR_PYTHONPATH ]; then
         ANDROID_PYTHONPATH=$ANDROID_PYTHONPATH$VENDOR_PYTHONPATH
     fi