summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsoong_ui.bash30
-rw-r--r--tests/lib.sh4
2 files changed, 4 insertions, 30 deletions
diff --git a/soong_ui.bash b/soong_ui.bash
index 49c4b78c4..7bddb586b 100755
--- a/soong_ui.bash
+++ b/soong_ui.bash
@@ -18,34 +18,8 @@
# that's detected in the Go code, which skips calculating the startup time.
export TRACE_BEGIN_SOONG=$(date +%s%N)
-# Function to find top of the source tree (if $TOP isn't set) by walking up the
-# tree.
-function gettop
-{
- local TOPFILE=build/soong/root.bp
- if [ -n "${TOP-}" -a -f "${TOP-}/${TOPFILE}" ] ; then
- # The following circumlocution ensures we remove symlinks from TOP.
- (cd $TOP; PWD= /bin/pwd)
- else
- if [ -f $TOPFILE ] ; then
- # The following circumlocution (repeated below as well) ensures
- # that we record the true directory name and not one that is
- # faked up with symlink names.
- PWD= /bin/pwd
- else
- local HERE=$PWD
- T=
- while [ \( ! \( -f $TOPFILE \) \) -a \( $PWD != "/" \) ]; do
- \cd ..
- T=`PWD= /bin/pwd -P`
- done
- \cd $HERE
- if [ -f "$T/$TOPFILE" ]; then
- echo $T
- fi
- fi
- fi
-}
+source $(cd $(dirname $BASH_SOURCE) &> /dev/null && pwd)/../make/shell_utils.sh
+require_top
# Save the current PWD for use in soong_ui
export ORIGINAL_PWD=${PWD}
diff --git a/tests/lib.sh b/tests/lib.sh
index ae8875a9a..24d6d4c82 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -85,7 +85,7 @@ function create_mock_soong {
create_mock_bazel
copy_directory build/blueprint
copy_directory build/soong
- copy_directory build/make/tools/rbcrun
+ copy_directory build/make
symlink_directory prebuilts/sdk
symlink_directory prebuilts/go
@@ -163,4 +163,4 @@ function scan_and_run_tests {
for f in ${test_fns[*]}; do
$f
done
-} \ No newline at end of file
+}