From 2a524498986cbbfa4591f3adfb5417cc838fe254 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Fri, 19 Feb 2021 03:16:57 -0800
Subject: [PATCH] Depend on shim targets in the Java API

PiperOrigin-RevId: 358370930
Change-Id: I1890368dec43716c2bbcbdc27b60a13e39903d06
---
 tensorflow/lite/BUILD                                  | 2 +-
 tensorflow/lite/core/shims/cc/kernels/register.h       | 2 --
 tensorflow/lite/create_op_resolver_with_builtin_ops.cc | 7 +++----
 tensorflow/lite/java/BUILD                             | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD
index 0c9099103c2..1c05ff86d19 100644
--- a/tensorflow/lite/BUILD
+++ b/tensorflow/lite/BUILD
@@ -751,7 +751,7 @@ cc_library(
     deps = [
         ":mutable_op_resolver",
         ":op_resolver",
-        "//tensorflow/lite/core/shims:builtin_ops",
+        "//tensorflow/lite/kernels:builtin_ops",
     ],
 )
 
diff --git a/tensorflow/lite/core/shims/cc/kernels/register.h b/tensorflow/lite/core/shims/cc/kernels/register.h
index 55bed158b0b..05c96eb47f7 100644
--- a/tensorflow/lite/core/shims/cc/kernels/register.h
+++ b/tensorflow/lite/core/shims/cc/kernels/register.h
@@ -21,8 +21,6 @@ namespace tflite_shims {
 namespace ops {
 namespace builtin {
 using BuiltinOpResolver = ::tflite::ops::builtin::BuiltinOpResolver;
-using BuiltinOpResolverWithoutDefaultDelegates =
-    ::tflite::ops::builtin::BuiltinOpResolverWithoutDefaultDelegates;
 }  // namespace builtin
 }  // namespace ops
 }  // namespace tflite_shims
diff --git a/tensorflow/lite/create_op_resolver_with_builtin_ops.cc b/tensorflow/lite/create_op_resolver_with_builtin_ops.cc
index 8a6c670fc4a..fb8b6eaeb2b 100644
--- a/tensorflow/lite/create_op_resolver_with_builtin_ops.cc
+++ b/tensorflow/lite/create_op_resolver_with_builtin_ops.cc
@@ -15,8 +15,8 @@ limitations under the License.
 
 #include <memory>
 
-#include "tensorflow/lite/core/shims/cc/kernels/register.h"
 #include "tensorflow/lite/create_op_resolver.h"
+#include "tensorflow/lite/kernels/register.h"
 
 namespace tflite {
 
@@ -26,9 +26,8 @@ namespace tflite {
 // linking this in, and should provide a CreateOpResolver() with selected ops
 // instead.
 std::unique_ptr<MutableOpResolver> CreateOpResolver() {  // NOLINT
-  return std::unique_ptr<::tflite_shims::ops::builtin::BuiltinOpResolver>(
-      new ::tflite_shims::ops::builtin::
-          BuiltinOpResolverWithoutDefaultDelegates());
+  return std::unique_ptr<tflite::ops::builtin::BuiltinOpResolver>(
+      new tflite::ops::builtin::BuiltinOpResolverWithoutDefaultDelegates());
 }
 
 }  // namespace tflite
diff --git a/tensorflow/lite/java/BUILD b/tensorflow/lite/java/BUILD
index a965fa1e654..81f43b2b737 100644
--- a/tensorflow/lite/java/BUILD
+++ b/tensorflow/lite/java/BUILD
@@ -467,8 +467,8 @@ tflite_jni_binary(
     deps = [
         # Note that we explicitly include the C API here for convenience, as it
         # allows bundling of the C lib w/ AAR distribution.
-        "//tensorflow/lite/core/shims:c_api",
-        "//tensorflow/lite/core/shims:c_api_experimental",
+        "//tensorflow/lite/c:c_api",
+        "//tensorflow/lite/c:c_api_experimental",
         "//tensorflow/lite/delegates/nnapi/java/src/main/native",
         "//tensorflow/lite/delegates/xnnpack:xnnpack_delegate",
         "//tensorflow/lite/java/src/main/native",