Merge "Fix build errors related to libtflite_static" am: 3ca9aa7fac am: d3ee69fd5d

Original change: https://android-review.googlesource.com/c/platform/external/tensorflow/+/2336882

Change-Id: I5560bf62aebcd7eb4f435325a86cbdb6d36bf15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 14 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 59b2ca94f6c..7cbcbc3fd7e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,13 +79,20 @@ genrule {
 
 subdirs = ["tensorflow/lite"]
 
+filegroup {
+    name: "tensorflow_tsl_logging_srcs",
+    srcs: [
+        "tensorflow/tsl/platform/default/logging.cc",
+        "tensorflow/tsl/platform/default/env_time.cc",
+    ],
+}
+
 cc_library_static {
     name: "TfliteNnapiDelegateTests_static",
     srcs: [
         "tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc",
+        "tensorflow/lite/kernels/test_delegate_providers.cc",
         "tensorflow/lite/kernels/test_util.cc",
-        "tensorflow/tsl/platform/default/logging.cc",
-        "tensorflow/tsl/platform/default/env_time.cc",
         "tensorflow/lite/kernels/acceleration_test_util.cc",
         "tensorflow/lite/kernels/acceleration_test_util_internal.cc",
         "tensorflow/lite/delegates/nnapi/acceleration_test_list.cc",
diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp
index 2bf29a432b8..4d404d8d853 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -20,6 +20,7 @@ cc_library_static {
     sdk_version: "current",
     min_sdk_version: "30",
     srcs: [
+        ":tensorflow_tsl_logging_srcs",
         "allocation.cc",
         "arena_planner.cc",
         "c/common.cc",
@@ -76,7 +77,6 @@ cc_library_static {
         "kernels/depth_to_space.cc",
         "kernels/depthwise_conv.cc",
         "kernels/dequantize.cc",
-        "kernels/detection_postprocess.cc",
         "kernels/div.cc",
         "kernels/dynamic_update_slice.cc",
         "kernels/eigen_support.cc",
@@ -122,7 +122,6 @@ cc_library_static {
         "kernels/mul.cc",
         "kernels/neg.cc",
         "kernels/non_max_suppression.cc",
-        "kernels/numeric_verify.cc",
         "kernels/one_hot.cc",
         "kernels/pack.cc",
         "kernels/pad.cc",
@@ -161,7 +160,6 @@ cc_library_static {
         "kernels/strided_slice.cc",
         "kernels/sub.cc",
         "kernels/svdf.cc",
-        "kernels/test_delegate_providers.cc",
         "kernels/tile.cc",
         "kernels/topk_v2.cc",
         "kernels/transpose.cc",
diff --git a/tensorflow/tsl/platform/default/logging.cc b/tensorflow/tsl/platform/default/logging.cc
index afcbbe185d1..771efbca195 100644
--- a/tensorflow/tsl/platform/default/logging.cc
+++ b/tensorflow/tsl/platform/default/logging.cc
@@ -24,7 +24,9 @@ limitations under the License.
 #endif
 #include "tensorflow/core/platform/env_time.h"
 #include "tensorflow/core/platform/macros.h"
+#ifdef TF_ANDROID_ENABLE_LOGSINK
 #include "tensorflow/core/platform/mutex.h"
+#endif
 
 #if defined(PLATFORM_POSIX_ANDROID)
 #include <android/log.h>
@@ -363,9 +365,11 @@ void LogMessage::GenerateLogMessage() {
            localtime(&now_seconds));
   const size_t tid_buffer_size = 10;
   char tid_buffer[tid_buffer_size] = "";
+#ifdef __ANDROID__
   if (log_thread_id) {
     snprintf(tid_buffer, sizeof(tid_buffer), " %7u", gettid());
   }
+#endif
   // TODO(jeff,sanjay): Replace this with something that logs through the env.
   fprintf(stderr, "%s.%06d: %c%s %s:%d] %s\n", time_buffer, micros_remainder,
           "IWEF"[severity_], tid_buffer, fname_, line_, str().c_str());