Automated rollback of change 145423129

Change: 145847687

tensorflow/tools/ci_build/builds/android.sh

@@ -20,11 +20,22 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${SCRIPT_DIR}/builds_common.sh"
 configure_android_workspace
 
-CPUS=armeabi-v7a,x86_64
+# The Bazel Android demo and Makefile builds are intentionally built for x86_64
+# and armeabi-v7a respectively to maximize build coverage while minimizing
+# compilation time. For full build coverage and exposed binaries, see
+# android_full.sh
 
+echo "========== TensorFlow Demo Build Test =========="
 # Enable sandboxing so that zip archives don't get incorrectly packaged
 # in assets/ dir (see https://github.com/bazelbuild/bazel/issues/2334)
 # TODO(gunan): remove extra flags once sandboxing is enabled for all builds.
-bazel --bazelrc=/dev/null build -c opt --fat_apk_cpu=${CPUS} \
+bazel --bazelrc=/dev/null build -c opt --fat_apk_cpu=x86_64 \
     --spawn_strategy=sandboxed --genrule_strategy=sandboxed \
     //tensorflow/examples/android:tensorflow_demo
+
+echo "========== Makefile Build Test =========="
+# Test Makefile build just to make sure it still works.
+if [ -z "$NDK_ROOT" ]; then
+   export NDK_ROOT=${ANDROID_NDK_HOME}
+fi
+tensorflow/contrib/makefile/build_all_android.sh

tensorflow/tools/ci_build/builds/android_full.sh

@@ -66,6 +66,7 @@ echo "Copying demo and Jar to ${OUT_DIR}"
 cp bazel-bin/tensorflow/examples/android/tensorflow_demo.apk \
     bazel-bin/tensorflow/contrib/android/libandroid_tensorflow_inference_java.jar ${OUT_DIR}
 
+echo "========== Makefile Build Test =========="
 # Test Makefile build just to make sure it still works.
 if [ -z "$NDK_ROOT" ]; then
    export NDK_ROOT=${ANDROID_NDK_HOME}