android_make now exactly the same as android_ninja

platform_tools/android/bin/android_make

Index: platform_tools/android/bin/android_make
diff --git a/platform_tools/android/bin/android_make b/platform_tools/android/bin/android_make
index a5f5268931010c134cbf19a6fc15888ef2bb41ce..83bd0401334d4c4acde9598bb7c5bbb9d15d2d73 100755
--- a/platform_tools/android/bin/android_make
+++ b/platform_tools/android/bin/android_make
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Fail-fast if anything in the script fails.

[epoger, 2014/04/03 14:15:37]

mtklein- I see you added the "set -e" in
https://github.com/google/skia/commit/48f9e1f2c1a164128fa3e1fc5e264aab16b2b884 .
 It causes me trouble, because it prevents me from seeing error messages from
android_setup.sh .  Is there something important we will be missing if we remove
it?

[mtklein, 2014/04/03 14:33:51]

Yeah, please leave it in once you're done hacking.  Failing fast makes it easier
to debug.  Tends to be subsequent errors are really just rippling consequences
of the first command failure, that is, noise until you fix the first problem.

[djsollen, 2014/04/03 14:43:51]

I disagree that it should be added back here.  If you want to set it after we
source android_setup.sh, so that we exit immediately after gyp, ninja, or ln
fails then I think that is fine.  However, doing it here breaks
android_setup.sh.

[mtklein, 2014/04/03 14:46:29]

I don't get it.  Does android_setup.sh intentionally run things that will fail? 
What's changed that makes this not safe?

[epoger, 2014/04/03 14:50:07]

The problem is, with "set -e" in place, there are at least some errors that
don't show up at all.  This is not something that changed with this CL...

Try this with the script as it stands before this CL:

$ ANDROID_SDK_ROOT="" platform_tools/android/bin/android_ninja 
$ 

(It fails, without any explanation as to why)

[mtklein, 2014/04/03 15:17:26]

Right, so if nothing's changed, let's not change this here.  The problems are in
android_setup.sh and can be fixed there.

Let's say you want to see the ant error message.  Write these lines
  which ant &> /dev/null
  if [[ "$?" != "0" ]]; then
    echo "ERROR: Unable to find ant. Please install it before proceeding."
    exit 1
  fi
as
  if ! which -s ant; then
    echo "Can't find ant on your PATH."
    exit 1
  fi

So, for an unset ANDROID_SDK_ROOT, rewrite
  if [ -z "$ANDROID_SDK_ROOT" ]; then
    ANDROID_TOOL=$(which android 2>/dev/null)
    if [ -z "$ANDROID_TOOL" ]; then
      echo "ERROR: Please define ANDROID_SDK_ROOT in your environment to point"
      echo "       to a valid Android SDK installation."
      exit 1
    fi
    ANDROID_SDK_ROOT=$(cd $(dirname "$ANDROID_TOOL")/.. && pwd)
    exportVar ANDROID_SDK_ROOT "$ANDROID_SDK_ROOT"
  fi
as something like
  if [-z "$ANDROID_SDK_ROOT" ]; then
    if ANDROID_SDK_ROOT="$(dirname $(which android))/.."; then
      export ANDROID_SDK_ROOT
    else
      echo "No ANDROID_SDK_ROOT set and can't auto detect it from location of
android binary."
      exit 1
    fi
  fi

-set -e
-
 # Remove any existing .android_config file before running android_setup. If we
 # did not remove this now then we would build for whatever device type was
 # listed in the .android_config instead of the default device type.
@@ -11,14 +8,10 @@ rm -f .android_config
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $SCRIPT_DIR/android_setup.sh

[mtklein, 2014/04/03 14:33:51]

Derek, remind me why android_setup.sh is a separate script?  Maybe TODO: merge
it in here?  It's hard to reason about what android_setup.sh's doing for us
without hopping back and forth.

[djsollen, 2014/04/03 14:43:51]

The android_setup.sh script is a common include file that is used by most of our
android tools (e.g. android_run_skia, android_install_apk, etc.)

 
-if [ $(basename $0) = "android_make" ]; then
-    GYP_GENERATORS=make-android make ${APP_ARGS[@]}
-else
-    GYP_GENERATORS=ninja-android ./gyp_skia
-    OUT=$SKIA_OUT/${BUILDTYPE-Debug}   # Defaults to Debug if BUILDTYPE isn't set.
-    ninja -C $OUT ${APP_ARGS[@]}
-    ln -sf lib $OUT/lib.target         # android_run_skia looks in lib.target; ninja writes to lib.
-fi
+GYP_GENERATORS=ninja-android ./gyp_skia
+OUT=$SKIA_OUT/${BUILDTYPE-Debug}   # Defaults to Debug if BUILDTYPE isn't set.
+ninja -C $OUT ${APP_ARGS[@]}
+ln -sf lib $OUT/lib.target         # android_run_skia looks in lib.target; ninja writes to lib.

[mtklein, 2014/04/03 14:33:51]

Can you add TODO(mtklein): change android_run_skia ?

[epoger, 2014/04/03 14:50:07]

You mean like this?

[epoger, 2014/04/03 14:52:01]

(You'll have to see patchset 2 to see the TODO I added.  It doesn't show up if
you click on the
https://codereview.chromium.org/223943002/diff/1/platform_tools/android/bin/a...
comment link.)

 
 # Write the device id into the .android_config file.  This tells
 # android_run_skia the last build we completed.