Revert "Add android_ninja, like android_make for ninja."

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Parse the arguments for a DEVICE_ID.
 DEVICE_ID=""
 DEVICE_SERIAL=""
 while (( "$#" )); do
   if [[ $(echo "$1" | grep "^-d$") != "" ]];
   then
@@ skipping 147 matching lines @@
   DEFINES="${DEFINES} skia_shared_lib=1"
 
   # Setup the build variation depending on the target device
   TARGET_DEVICE="$1"
 
   if [ -z "$TARGET_DEVICE" ]; then
     if [ -f .android_config ]; then
       TARGET_DEVICE=$(cat .android_config)
       echo "INFO: no target device was specified so using the device (${TARGET_DEVICE}) from the most recent build"
     else
-      TARGET_DEVICE="arm_v7_thumb"
+      TARGET_DEVICE="arm_v7_thumb"  
       echo "INFO: no target device type was specified so using the default '${TARGET_DEVICE}'"
     fi
   fi
 
   case $TARGET_DEVICE in
     nexus_s)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_texture_cache_mb_limit=24"
       ANDROID_ARCH="arm"
       ;;
@@ skipping 51 matching lines @@
   echo "The build is targeting the device: $TARGET_DEVICE"
   export DEVICE_ID="$TARGET_DEVICE"
 
   # Set up the toolchain.
   setup_toolchain
   if [[ "$?" != "0" ]]; then
     return 1
   fi
   DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"
 
+  # Use the "android" flavor of the Makefile generator for both Linux and OS X.
+  exportVar GYP_GENERATORS "make-android"
   exportVar GYP_DEFINES "$DEFINES"
   exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}"
 }
 
 # adb_pull_if_needed(android_src, host_dst)
 adb_pull_if_needed() {
 
   # get adb location
   source $SCRIPT_DIR/utils/setup_adb.sh
 
@@ skipping 67 matching lines @@
   else
     $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
   fi
 }
 
 # Set up the device.
 setup_device "${DEVICE_ID}"
 if [[ "$?" != "0" ]]; then
   exit 1
 fi