diff options
| -rw-r--r-- | cmd/microfactory/microfactory.bash | 5 | ||||
| -rwxr-xr-x | soong_ui.bash | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/cmd/microfactory/microfactory.bash b/cmd/microfactory/microfactory.bash index 7489fe398..6bd0f400a 100644 --- a/cmd/microfactory/microfactory.bash +++ b/cmd/microfactory/microfactory.bash @@ -39,9 +39,12 @@ function getoutdir 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}" } diff --git a/soong_ui.bash b/soong_ui.bash index 105af9f48..34c44a48e 100755 --- a/soong_ui.bash +++ b/soong_ui.bash @@ -47,8 +47,12 @@ function gettop 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" "$@" |