Reenable yasm for Android x86 and x86-64 on Linux

platform_tools/android/bin/utils/setup_toolchain.sh

+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 #!/bin/bash
 #
 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 # check that the preconditions for this script are met
 if [ $(type -t verbose) != 'function' ]; then
   echo "ERROR: The verbose function is expected to be defined"
@@ skipping 72 matching lines @@
 if [ -z "$GCC" ]; then
   echo "ERROR: Could not find Android cross-compiler in: $ANDROID_TOOLCHAIN"
   return 1
 fi
 
 # Remove the '-gcc' at the end to get the full toolchain prefix
 ANDROID_TOOLCHAIN_PREFIX=${GCC%%-gcc}
 
 CCACHE=${ANDROID_MAKE_CCACHE-$(which ccache || true)}
 
-if [ -z $USE_CLANG ]; then
-  exportVar CC "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
-  exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
-  exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+# Cross compiling Android on Mac is not currently supported by gyp.
+# It doesn't appear to be supported on Windows either.
+# As of now, we will only support cross compiling on Linux.
+# libjpeg-turbo assembly code for x86 and x86-64 Android devices
+# must be disabled for Android on non-Linux platforms because
+# of this issue.  We still support compiling on Mac and other
+# variants for local development, but shipping versions of Skia
+# should be compiled on Linux for performance reasons.
+# TODO (msarett): Collect more information about this.
+if [ $(uname) == "Linux" ]; then
+  if [ -z $USE_CLANG ]; then
+    exportVar CC_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+    exportVar CXX_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
+    exportVar LINK_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+    exportVar CC_host "$CCACHE cc"
+    exportVar CXX_host "$CCACHE c++"
+    exportVar LINK_host "$CCACHE cc"
+  else
+    # temporarily disable ccache as it is generating errors
+    CCACHE=""
+    exportVar CC_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
+    exportVar CXX_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang++"
+    exportVar LINK_target "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
+    exportVar CC_host "$CCACHE clang"
+    exportVar CXX_host "$CCACHE clang++"
+    exportVar LINK_host "$CCACHE clang"
+  fi
+
+  exportVar AR_target "$ANDROID_TOOLCHAIN_PREFIX-ar"
+  exportVar RANLIB_target "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
+  exportVar OBJCOPY_target "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
+  exportVar STRIP_target "$ANDROID_TOOLCHAIN_PREFIX-strip"
+  exportVar AR_host "ar"
+  exportVar RANLIB_host "ranlib"
+  exportVar OBJCOPY_host "objcopy"
+  exportVar STRIP_host "strip"
 else
-  # temporarily disable ccache as it is generating errors
-  CCACHE=""
-  exportVar CC "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
-  exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang++"
-  exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
+  if [ -z $USE_CLANG ]; then
+    exportVar CC "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+    exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-g++"
+    exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-gcc"
+  else
+    # temporarily disable ccache as it is generating errors
+    CCACHE=""
+    exportVar CC "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
+    exportVar CXX "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang++"
+    exportVar LINK "$CCACHE $ANDROID_TOOLCHAIN_PREFIX-clang"
+  fi
+
+  exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar"
+  exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
+  exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
+  exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
 fi
 
-exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar"
-exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
-exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
-exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
-
 # Create symlinks for nm & readelf and add them to the path so that the ninja
 # build uses them instead of attempting to use the one on the system.
 # This is required to build using ninja on a Mac.
 if [ $(uname) == "Darwin" ]; then
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as
 fi
 
 exportVar PATH $ANDROID_TOOLCHAIN:$PATH