envsetup.sh: take control of defining OUT_DIR and DIST_DIR

Delegate calculation of OUT_DIR and DIST_DIR to envsetup.sh. That way it
can be reused for other scripts like build.sh.
Also ensure that envsetup.sh is only included once.

Change-Id: Ie61b8b6bc2ac10d31302a0e161748899c7463496
Signed-off-by: Matthias Maennich <maennich@google.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/build.sh b/build.sh
index dfde9b11..94eb2b5c 100755
--- a/build.sh
+++ b/build.sh
@@ -130,11 +130,8 @@ SIGN_ALGO=sha512
 source "${ROOT_DIR}/build/envsetup.sh"
 
 export MAKE_ARGS=$@
-export COMMON_OUT_DIR=$(readlink -m ${OUT_DIR:-${ROOT_DIR}/out/${BRANCH}})
-export OUT_DIR=$(readlink -m ${COMMON_OUT_DIR}/${KERNEL_DIR})
 export MODULES_STAGING_DIR=$(readlink -m ${COMMON_OUT_DIR}/staging)
 export MODULES_PRIVATE_DIR=$(readlink -m ${COMMON_OUT_DIR}/private)
-export DIST_DIR=$(readlink -m ${DIST_DIR:-${COMMON_OUT_DIR}/dist})
 export UNSTRIPPED_DIR=${DIST_DIR}/unstripped
 export KERNEL_UAPI_HEADERS_DIR=$(readlink -m ${COMMON_OUT_DIR}/kernel_uapi_headers)
 
diff --git a/envsetup.sh b/envsetup.sh
index d8a97299..db02d2c5 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -20,6 +20,7 @@
 #     just:
 #       make -j24
 
+[ -n "$ENVSETUP_SH_INCLUDED" ] && return || export ENVSETUP_SH_INCLUDED=1
 
 # TODO: Use a $(gettop) style method.
 export ROOT_DIR=$PWD
@@ -27,6 +28,10 @@ export ROOT_DIR=$PWD
 export BUILD_CONFIG=${BUILD_CONFIG:-build.config}
 . ${ROOT_DIR}/${BUILD_CONFIG}
 
+export COMMON_OUT_DIR=$(readlink -m ${OUT_DIR:-${ROOT_DIR}/out/${BRANCH}})
+export OUT_DIR=$(readlink -m ${COMMON_OUT_DIR}/${KERNEL_DIR})
+export DIST_DIR=$(readlink -m ${DIST_DIR:-${COMMON_OUT_DIR}/dist})
+
 echo "========================================================"
 echo "= build config: ${ROOT_DIR}/${BUILD_CONFIG}"
 cat ${ROOT_DIR}/${BUILD_CONFIG}