summaryrefslogtreecommitdiff
path: root/shell_utils.sh
diff options
context:
space:
mode:
author Joe Onorato <joeo@google.com> 2024-05-14 15:06:48 -0700
committer Joe Onorato <joeo@google.com> 2024-05-14 15:12:53 -0700
commit2312475f66d21b74162f6cfcdf5bd9cc4f5e9fc4 (patch)
treea483def39c82d94247fef0fd4a6f87b08c89925b /shell_utils.sh
parent32b2aa33c57bd99f6298353bbf9dac769153a61a (diff)
Clean cruft out of envsetup.sh.
aninja and overrideflags moved to build/soong/bin Bug: 340648588 Test: manual Change-Id: I1d426b628f15674e142df4152661d3f4b9b56320
Diffstat (limited to 'shell_utils.sh')
-rw-r--r--shell_utils.sh15
1 files changed, 12 insertions, 3 deletions
diff --git a/shell_utils.sh b/shell_utils.sh
index 9de5a504e5..15051e9585 100644
--- a/shell_utils.sh
+++ b/shell_utils.sh
@@ -40,9 +40,7 @@ function gettop
fi
}
-# Sets TOP, or if the root of the tree can't be found, prints a message and
-# exits. Since this function exits, it should not be called from functions
-# defined in envsetup.sh.
+# Asserts that the root of the tree can be found.
if [ -z "${IMPORTING_ENVSETUP:-}" ] ; then
function require_top
{
@@ -54,6 +52,17 @@ function require_top
}
fi
+# Asserts that the lunch variables have been set
+if [ -z "${IMPORTING_ENVSETUP:-}" ] ; then
+function require_lunch
+{
+ if [[ ! $TARGET_PRODUCT || ! $TARGET_RELEASE || ! $TARGET_BUILD_VARIANT ]] ; then
+ echo "Please run lunch and try again." >&2
+ exit 1
+ fi
+}
+fi
+
function getoutdir
{
local top=$(gettop)