* Fix support of android-arm and android-x86 platforms for Tenso…

…rFlow presets (pull #297)

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Add support for `android-arm` and `android-x86` platforms to TensorFlow presets ([pull #297](https://github.com/bytedeco/javacpp-presets/pull/297))
  * Keep a reference of `tensorflow.SessionOptions` in `AbstractSession` to prevent premature deallocation ([pull #297](https://github.com/bytedeco/javacpp-presets/pull/297))
  * Enable CUDA in `cppbuild.sh` script for TensorFlow ([issue #294](https://github.com/bytedeco/javacpp-presets/issues/294))
  * Bundle `libgomp.so.1` in JAR files of OpenCV for the sake of some Linux distributions ([issue bytedeco/javacv#436](https://github.com/bytedeco/javacv/issues/436))

tensorflow/cppbuild.sh

@@ -33,10 +33,19 @@ cd tensorflow-$TENSORFLOW_VERSION
 
 case $PLATFORM in
 	android-arm)
+        export CC="/usr/bin/gcc"
+        export CXX="/usr/bin/g++"
         patch -Np1 < ../../../tensorflow-$TENSORFLOW_VERSION-android.patch
         sed -i "/    path=\"<PATH_TO_NDK>\",/c\    path=\"${ANDROID_NDK}\"," ./WORKSPACE
         export BUILDFLAGS="--crosstool_top=//external:android/crosstool --cpu=armeabi-v7a --host_crosstool_top=@bazel_tools//tools/cpp:toolchain"
         ;;
+	android-x86)
+        export CC="/usr/bin/gcc"
+        export CXX="/usr/bin/g++"
+        patch -Np1 < ../../../tensorflow-$TENSORFLOW_VERSION-android.patch
+        sed -i "/    path=\"<PATH_TO_NDK>\",/c\    path=\"${ANDROID_NDK}\"," ./WORKSPACE
+        export BUILDFLAGS="--crosstool_top=//external:android/crosstool --cpu=x86 --host_crosstool_top=@bazel_tools//tools/cpp:toolchain"
+        ;;
     linux-x86)
         export CC="/usr/bin/gcc"
         export CXX="/usr/bin/g++"