Build and expose benchmark_model binary as part of Android nightly build, and also run build_all_android.sh for better build coverage.

andrewharp · tensorflower-gardener · commit 024507b55a48 · 2017-01-10T19:46:30.000-08:00
Change: 144158273
diff --git a/tensorflow/tools/ci_build/builds/android_full.sh b/tensorflow/tools/ci_build/builds/android_full.sh
@@ -43,11 +43,13 @@ do
         --host_crosstool_top=@bazel_tools//tools/cpp:toolchain \
         //tensorflow/core:android_tensorflow_lib \
         //tensorflow/contrib/android:libtensorflow_inference.so \
-        //tensorflow/examples/android:libtensorflow_demo.so
+        //tensorflow/examples/android:libtensorflow_demo.so \
+        //tensorflow/tools/benchmark:benchmark_model
 
     copy_lib bazel-bin/tensorflow/core/libandroid_tensorflow_lib.lo
     copy_lib bazel-bin/tensorflow/contrib/android/libtensorflow_inference.so
     copy_lib bazel-bin/tensorflow/examples/android/libtensorflow_demo.so
+    copy_lib bazel-bin/tensorflow/tools/benchmark/benchmark_model
 done
 
 # Build Jar and also demo containing native libs for all architectures.
@@ -63,3 +65,6 @@ bazel --bazelrc=/dev/null build -c opt --fat_apk_cpu=${CPUS} \
 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}
+
+# Test Makefile build just to make sure it still works.
+tensorflow/contrib/makefile/build_all_android.sh
