commit aad984bea1c4aea1f4391cf3395a91793669c83b
author Paul Duffin <paulduffin@google.com> Fri Mar 25 11:00:47 2022 +0000
committer Paul Duffin <paulduffin@google.com> Fri Mar 25 11:10:44 2022 +0000
tree 5c9b32975f5cf2b03b6f3a1406247c52dfa61e4c
parent ffa89fd0a094d58bc548aa024e54e3fd35ae69c2

Fix failures caused by lack of ANDROID_BUILD_TOP on build servers

Bug: 226686554
Bug: 218685706
Test: unset ANDROID_BUILD_TOP
      packages/modules/common/build/mainline_modules_sdks.sh
Change-Id: I1da4309e0537b251b3f7a6c2160bef77e6f218ff

build/mainline_modules_sdks.sh

diff --git a/build/mainline_modules_sdks.sh b/build/mainline_modules_sdks.sh
index 766bafc..35a677e 100755
--- a/build/mainline_modules_sdks.sh
+++ b/build/mainline_modules_sdks.sh
@@ -56,6 +56,10 @@
   # provided by the build to ensure consistency across build environments.
   export DIST_DIR OUT_DIR
 
+  # Make sure that the ANDROID_BUILD_TOP (which is the same as the current
+  # directory as checked above) is exported to Python.
+  export ANDROID_BUILD_TOP="${PWD}"
+
   # The path to this tool is the .sh script that lives alongside the .py script.
   TOOL_PATH="${py3script%.py}.sh"
   prebuilts/build-tools/linux-x86/bin/py3-cmd -u "${py3script}" \