Enable test_benchmark.* files for Android build.

Change: 119591021

tensorflow/core/BUILD

@@ -544,7 +544,6 @@ tf_cuda_library(
 
 # Android-specific BUILD targets
 load("//tensorflow:tensorflow.bzl", "tf_android_core_proto_sources")
-load("//tensorflow:tensorflow.bzl", "tf_android_core_proto_sources_relative")
 load("//tensorflow:tensorflow.bzl", "tf_android_core_proto_headers")
 
 # List of protos we want on android
@@ -591,8 +590,6 @@ filegroup(
             "lib/png/*.cc",
             "util/events_writer.cc",
             "util/events_writer.h",
-            "util/reporter.cc",
-            "util/reporter.h",
             # Exclude all protobuf/google headers except protobuf_android.h
             "platform/google/cord_coding.h",
             "platform/google/dynamic_annotations.h",
@@ -604,8 +601,6 @@ filegroup(
             "platform/google/*.cc",
             "platform/google/test_benchmark.cc",
             "platform/google/test_benchmark.h",
-            "platform/test_benchmark.h",
-            "platform/default/test_benchmark.cc",
             "user_ops/**/*.cu.cc",
             "common_runtime/gpu/*.cc",
             "common_runtime/gpu_device_factory.cc",

tensorflow/tensorflow.bzl

@@ -62,6 +62,7 @@ def tf_android_core_proto_sources_relative():
         "protobuf/config.proto",
         "protobuf/saver.proto",
         "util/saved_tensor_slice.proto",
+        "util/test_log.proto",
   ]
 
 # Returns the list of pb.h headers that are generated for