Refactor and rename install-build-deps-android-sdk

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 4a3f9fb9522ce9fcb4096572fca97b4c9e9fe77b..03f9402896568dce633935cc01da7b7151062ad2 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -10,24 +10,14 @@
 # To run this script, the system environment ANDROID_NDK_ROOT must be set
 # to Android NDK's root path.
 #
-# TODO(michaelbai): Develop a standard for NDK/SDK integration.
-#
 # If current path isn't the Chrome's src directory, CHROME_SRC must be set
 # to the Chrome's src directory.
 
-if [ ! -d "${ANDROID_NDK_ROOT}" ]; then
-  echo "ANDROID_NDK_ROOT must be set to the path of Android NDK, Revision 6b." \
-    >& 2
-  echo "which could be installed by" >& 2
-  echo "<chromium_tree>/src/build/install-build-deps-android-sdk.sh" >& 2
-  return 1
-fi
-
-if [ ! -d "${ANDROID_SDK_ROOT}" ]; then
-  echo "ANDROID_SDK_ROOT must be set to the path of Android SDK, Android 3.2." \
-    >& 2
-  echo "which could be installed by" >& 2
-  echo "<chromium_tree>/src/build/install-build-deps-android-sdk.sh" >& 2
+if [[ -z $ANDROID_NDK_ROOT || -z $ANDROID_SDK_ROOT \

[John Grabowski, 2012/07/17 18:38:15]

If you don't quote these, then you will get the OPPOSITE result of what you
expect if the variables are not set.

[Isaac (away), 2012/07/18 09:45:05]

I thought quotes were unnecessary in double bracket tests?  Why would I get
opposite result?

[John Grabowski, 2012/07/18 20:48:43]

You tell me.  Run the script below for a hint.


#!/bin/bash

if [[ -z $UNDEFINED ]]; then
  echo UNDEFINED
fi

if [[ -z $"{UNDEFINED}" ]]; then
  echo UNDEFINED_QUOTED
fi

+      || ! -d $ANDROID_NDK_ROOT || ! -d $ANDROID_SDK_ROOT ]]; then
+  echo "SDK / NDK paths not set or not installed." >&2
+  echo "To install: set ANDROID_SDK_ROOT and ANDROID_NDK_ROOT and run" >&2
+  echo "<chromium>/build/install_android_sdk_ndk.py" >&2
   return 1
 fi