android: Refine ANDROID_SDK_ROOT definition for SDK builds.

android: Refine ANDROID_SDK_ROOT definition for SDK builds.

A small patch to ensure using . build/android/envsetup.sh --sdk
works properly if ANDROID_SDK_ROOT is already defined with a non-SDK
compatible directory path.

BUG=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=156056

[Philippe, 2012-09-05 15:40:33]

lgtm

Thanks for improving this David!

[Isaac (away), 2012-09-05 16:47:36]

https://chromiumcodereview.appspot.com/10920094/diff/1/build/android/envsetup...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10920094/diff/1/build/android/envsetup...
build/android/envsetup_functions.sh:180: ! -d
"${ANDROID_SDK_ROOT}/${sdk_suffix}" ]; then
can we simplify this to just check the latter directory?

if not, nit: personally I don't like -o, prefer to replace the test construct
with a double bracket test [[ ]], and use || for the or.

[digit1, 2012-09-05 17:04:39]

https://chromiumcodereview.appspot.com/10920094/diff/1/build/android/envsetup...
File build/android/envsetup_functions.sh (right):

https://chromiumcodereview.appspot.com/10920094/diff/1/build/android/envsetup...
build/android/envsetup_functions.sh:180: ! -d
"${ANDROID_SDK_ROOT}/${sdk_suffix}" ]; then
On 2012/09/05 16:47:36, Isaac wrote:
> can we simplify this to just check the latter directory?
> 
Done, also changed the test to verify that the variable is not empty before
calling -d on it.

> if not, nit: personally I don't like -o, prefer to replace the test construct
> with a double bracket test [[ ]], and use || for the or.

I've uploaded a second patch set that changes all if [ ... ]; usage to if [[ ...
]];

[Isaac (away), 2012-09-06 06:18:34]

lgtm, thanks for doing that.  double bracket tests are generally safer since
variables with spaces don't get expanded into multiple expressions.

[bulach, 2012-09-06 10:24:40]

lgtm, thanks!

[commit-bot: I haz the power, 2012-09-06 10:33:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/digit@chromium.org/10920094/5001

[commit-bot: I haz the power, 2012-09-06 15:09:53]

Try job failure for 10920094-5001 (retry) on win_rel for step
"sync_integration_tests".
It's a second try, previously, steps "interactive_ui_tests, browser_tests,
sync_integration_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2012-09-11 14:49:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/digit@chromium.org/10920094/5001

[commit-bot: I haz the power, 2012-09-11 18:03:55]

Change committed as 156056