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

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 for review feedback(remove PWD and add comments) 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 | « no previous file | 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 6ed168de6aa7e5d306736d3d884406a822f445e4..63c6f869efef76bf660d66276d1fac110e3a4c4f 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -93,7 +93,15 @@ 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
John Grabowski 2012/05/25 16:27:19 Sorry I didn't mention this the first time, but...
Wei James(wistoch) 2012/05/26 05:01:47 if we are in the correct directory and CHROME_SRC
John Grabowski 2012/05/29 17:50:23 OK... it's a little cryptic. Can you add this comm
Wei James(wistoch) 2012/05/30 03:00:15 fixed. thanks
+ # If current directory is not in $CHROME_SRC, it might be set for other
+ # source tree.
+ 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 | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698