update our build system to support the experimental L-Release NDK

platform_tools/android/bin/android_setup.sh

 #!/bin/bash
 #
 # android_setup.sh: Sets environment variables used by other Android scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 BUILDTYPE=${BUILDTYPE-Debug}
 
 while (( "$#" )); do
@@ skipping 98 matching lines @@
     galaxy_nexus)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=1 arm_version=7 arm_thumb=1"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="arm"
       ;;
     intel_rhb | razr_i | x86)
       DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="x86"
       ;;
+    x86_64 | x64)
+      DEFINES="${DEFINES} skia_arch_type=x86 skia_arch_width=64"
+      DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"

[mtklein, 2014/07/08 20:16:53]

No need to cap any of these before trying the default?  We only do this for
resource-limited devices today.

[djsollen, 2014/07/08 20:39:05]

Done.

+      ANDROID_ARCH="x86_64"
+      ;;
     arm_v7)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=0"
       ANDROID_ARCH="arm"
       ;;
     arm_v7_thumb | nvidia_logan)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon_optional=1 arm_version=7 arm_thumb=1"
       ANDROID_ARCH="arm"
       ;;
     arm)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=0"
       ANDROID_ARCH="arm"
       ;;
     arm_thumb)
       DEFINES="${DEFINES} skia_arch_type=arm arm_neon=0 arm_thumb=1"
       ANDROID_ARCH="arm"
       ;;
+    arm64)
+      DEFINES="${DEFINES} skia_arch_type=arm64 skia_arch_width=64"

[borenet, 2014/07/08 20:04:12]

Any reason not to do:
"skia_arch_type=arm skia_arch_width=64"
?

That's more in line with arch_type=x86 arch_width=64

[djsollen, 2014/07/08 20:14:46]

we can, but we already have gyp conditions that use arm64 and I didn't want to
have to refactor that as part of this CL.

+      DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
+      ANDROID_ARCH="arm64"
+      ;;
     mips)
       DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=32"
       DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
       ANDROID_ARCH="mips"
       ;;
+    mips64)
+      DEFINES="${DEFINES} skia_arch_type=mips skia_arch_width=64"
+      DEFINES="${DEFINES} skia_resource_cache_mb_limit=32"
+      ANDROID_ARCH="mips64"
+      ;;
     *)
       if [ -z "$ANDROID_IGNORE_UNKNOWN_DEVICE" ]; then
           echo "ERROR: unknown device $TARGET_DEVICE"
           exit 1
       fi
       # If ANDROID_IGNORE_UNKNOWN_DEVICE is set, then ANDROID_TOOLCHAIN
       # or ANDROID_ARCH should be set; Otherwise, ANDROID_ARCH
       # defaults to 'arm' and the default ARM toolchain is used.
       DEFINES="${DEFINES} skia_arch_type=${ANDROID_ARCH-arm}"
       # If ANDROID_IGNORE_UNKNOWN_DEVICE is set, extra gyp defines can be
@@ skipping 95 matching lines @@
       adb_push_if_needed $HOST_SRC $ANDROID_DST
     else
       echo -n "$ANDROID_DST "
       $ADB $DEVICE_SERIAL shell mkdir -p "$(dirname "$ANDROID_DST")"
       $ADB $DEVICE_SERIAL push $HOST_SRC $ANDROID_DST
     fi
   fi
 }
 
 setup_device "${DEVICE_ID}"