commit 3e3fab510ce0af59cb69088af98a21dba25a848d
author Joe Onorato <joeo@google.com> Sun Feb 04 00:51:59 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Feb 04 00:51:59 2024 +0000
tree 5ac19d2f1d13b7a0678982ab2e538e6f9e49c2fc
parent 5c40932a4806fbc3b5540f1f8bc21a8dc8d35705
parent 62bc1b46f194e9e5735b5c08c61a36e2d1998e89

Merge "Add build/soong/bin to the paths" into main am: 62bc1b46f1

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

Change-Id: Ia931d32920c435c2b5360175f94cee7c1395ba51
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 e180cf1..6111952 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -366,7 +366,8 @@
     fi
 
     # And in with the new...
-    ANDROID_GLOBAL_BUILD_PATHS=$T/build/bazel/bin
+    ANDROID_GLOBAL_BUILD_PATHS=$T/build/soong/bin
+    ANDROID_GLOBAL_BUILD_PATHS+=:$T/bazel/bin
     ANDROID_GLOBAL_BUILD_PATHS+=:$T/development/scripts
     ANDROID_GLOBAL_BUILD_PATHS+=:$T/prebuilts/devtools/tools