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

build/android/envsetup.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sets up environment for building Chromium on Android. Only Android NDK,
 # Revision 6b on Linux or Mac is offically supported.
 #
 # 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
+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
 
-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
-  return 1
-fi
-
 host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
 
 case "${host_os}" in
   "linux")
     toolchain_dir="linux-x86"
     ;;
   "mac")
     toolchain_dir="darwin-x86"
     ;;
   *)
@@ skipping 114 matching lines @@
 export GYP_DEFINES="${DEFINES}"
 
 # Use the "android" flavor of the Makefile generator for both Linux and OS X.
 export GYP_GENERATORS="make-android"
 
 # Use our All target as the default
 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
 # We want to use our version of "all" targets.
 export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"