scripts: Handle relative build-root paths

Bug: 285203365
Test: m trusty_generic-arm64-test-debug
Change-Id: I342635df955ff984332fd4e0e0dd8791a814bee9

1 files changed, 8 insertions, 2 deletions

diff --git a/scripts/build.py b/scripts/build.py
index 8df3563..62300f9 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -645,7 +645,6 @@ def create_test_map(args, build_config, projects):
 
 def main(default_config=None, emulator=True):
     top = os.path.abspath(os.path.join(script_dir, "../../../../.."))
-    os.chdir(top)
 
     parser = argparse.ArgumentParser()
 
@@ -658,7 +657,7 @@ def main(default_config=None, emulator=True):
     )
     parser.add_argument(
         "--build-root",
-        type=str,
+        type=os.path.abspath,
         default=os.path.join(top, "build-root"),
         help="Root of intermediate build directory.",
     )
@@ -740,6 +739,13 @@ def main(default_config=None, emulator=True):
     )
     args = parser.parse_args()
 
+    # Change the current directory to the Trusty root
+    # We do this after parsing all the arguments because
+    # some of the paths, e.g., build-root, might be relative
+    # to the directory that the script was called from, not
+    # to the Trusty root directory
+    os.chdir(top)
+
     build_config = TrustyBuildConfig(
         config_file=args.config, android=args.android
     )