Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3252)

Unified Diff: build/android/envsetup.sh

Issue 10409048: validate CHROME_SRC setting to avoid confusion (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix typo Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 7ddd064ad6c5be0cf71b214d3455943d038de6ba..756c27b8b9dc7f499387796cc76d5ac563ff6410 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -93,7 +93,17 @@ export PATH=$PATH:${ANDROID_TOOLCHAIN}
if [ -z "${CHROME_SRC}" ]; then
# If $CHROME_SRC was not set, assume current directory is CHROME_SRC.
- export CHROME_SRC=$(readlink -f .)
+ export CHROME_SRC="${PWD}"
+fi
+
+if [ "${PWD/"${CHROME_SRC}"/}" == "${PWD}" ]; then
+ # If current directory is not in $CHROME_SRC, it might be set for other
+ # source tree. If $CHROME_SRC was set correctly and we are in the correct
+ # directory, "${PWD/"${CHROME_SRC}"/}" will be "".
+ # Otherwise, it will equal to "${PWD}"
+ echo "Warning: Current directory is out of CHROME_SRC, it may not be \
+the one you want."
+ echo "${CHROME_SRC}"
fi
if [ ! -d "${CHROME_SRC}" ]; then
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698