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 3a3c6a7f9dd7bd9e79661169a0e39069f66e004a..7cc8a70f54dd1247daf33618754cf7c75714790f 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -15,19 +15,19 @@
 # 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
+if [[ -z $ANDROID_SDK_ROOT ]]; then
+  export ANDROID_SDK_ROOT="/usr/local/google/android-sdk-linux"
+  echo "ANDROID_SDK_ROOT null, setting to: $ANDROID_SDK_ROOT" >&2
+fi
+
+if [[ -z $ANDROID_NDK_ROOT ]]; then
+  export ANDROID_NDK_ROOT="/usr/local/google/android-ndk-r7"
+  echo "ANDROID_NDK_ROOT null, setting to: $ANDROID_NDK_ROOT" >&2
 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 [[ ! -d "$ANDROID_NDK_ROOT" || ! -d "$ANDROID_SDK_ROOT" ]]; then
+  echo "SDK / NDK paths not set or not installed" >&2
+  echo "To install: <chromium src root>/build/install-android-sdk-ndk.sh"
   return 1
 fi