commit 1b822867360844bea1c30facb95492ff21eb4e6b
author Dan Willemsen <dwillemsen@google.com> Wed Jul 12 15:00:05 2017 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Jul 12 16:41:09 2017 -0700
tree 3c982962dd19a7cf03c78d840ef08dfa5ff1da89
parent c40e10bd6beb2be8ecb2f1ce478b70ddc04fd328

Support running soong_ui.bash from anywhere in the tree

It will cd to $TOP before running soong_ui itself, so that soong_ui
still runs from the top of the tree. ORIGINAL_PWD is saved so that we
can reference that later (for example, to move 'mma' implementation into
Go).

Test: cd system; ../build/soong/soong_ui.bash
Test: Set absolute / relative OUT_DIR or OUT_DIR_COMMON_BASE and repeat
Change-Id: Icb67a3ee6a3358cca50300755c8953419fc19437

cmd/microfactory/microfactory.bash

diff --git a/cmd/microfactory/microfactory.bash b/cmd/microfactory/microfactory.bash
index 7489fe3..6bd0f40 100644
--- a/cmd/microfactory/microfactory.bash
+++ b/cmd/microfactory/microfactory.bash
@@ -39,9 +39,12 @@
         if [ "${OUT_DIR_COMMON_BASE-}" ]; then
             out_dir="${OUT_DIR_COMMON_BASE}/$(basename ${TOP})"
         else
-            out_dir="${TOP}/out"
+            out_dir="out"
         fi
     fi
+    if [[ "${out_dir}" != /* ]]; then
+        out_dir="${TOP}/${out_dir}"
+    fi
     echo "${out_dir}"
 }
 

soong_ui.bash

diff --git a/soong_ui.bash b/soong_ui.bash
index 105af9f..34c44a4 100755
--- a/soong_ui.bash
+++ b/soong_ui.bash
@@ -47,8 +47,12 @@
     fi
 }
 
+# Save the current PWD for use in soong_ui
+export ORIGINAL_PWD=${PWD}
 export TOP=$(gettop)
-source build/soong/cmd/microfactory/microfactory.bash
+source ${TOP}/build/soong/cmd/microfactory/microfactory.bash
 
 build_go soong_ui android/soong/cmd/soong_ui
+
+cd ${TOP}
 exec "$(getoutdir)/soong_ui" "$@"