From b48df5c1f3c147b43bf7416da35ab7455ae21aa7 Mon Sep 17 00:00:00 2001
From: Thai Nguyen <thaink@google.com>
Date: Wed, 9 Dec 2020 16:17:08 -0800
Subject: [PATCH] Fixed backward reference error of
 tflite_custom_android_library

PiperOrigin-RevId: 346660735
Change-Id: Iff7a55bce35a13a28d57b11f995487e8710d0113
---
 tensorflow/lite/BUILD         | 16 +---------------
 tensorflow/lite/build_def.bzl |  4 ++--
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD
index 8e3bcc27567..295c071ba20 100644
--- a/tensorflow/lite/BUILD
+++ b/tensorflow/lite/BUILD
@@ -16,6 +16,7 @@ exports_files(glob([
     "models/testdata/*",
 ]) + [
     "create_op_resolver.h",
+    "create_op_resolver_with_selected_ops.cc",
 ])
 
 config_setting(
@@ -722,21 +723,6 @@ cc_library(
     ],
 )
 
-# This target is created for tflite_custom_cc_library build rule. It requires
-# the header file generated from gen_selected_ops so should not be depended on
-# directly.
-# TODO(b/174972014): Generate this target to give RegisterSelectedOps a custom namespace.
-cc_library(
-    name = "create_op_resolver_with_selected_ops",
-    srcs = ["create_op_resolver_with_selected_ops.cc"],
-    hdrs = ["create_op_resolver.h"],
-    copts = tflite_copts(),
-    deps = [
-        "//tensorflow/lite:mutable_op_resolver",
-        "//tensorflow/lite:op_resolver",
-    ],
-)
-
 cc_test(
     name = "util_test",
     size = "small",
diff --git a/tensorflow/lite/build_def.bzl b/tensorflow/lite/build_def.bzl
index 5895b7808de..1d02abc9ea2 100644
--- a/tensorflow/lite/build_def.bzl
+++ b/tensorflow/lite/build_def.bzl
@@ -800,7 +800,7 @@ def tflite_custom_cc_library(
             model = models,
         )
         real_srcs.append(":%s_registration" % name)
-        real_deps.append("//tensorflow/lite:create_op_resolver_with_selected_ops")
+        real_srcs.append("//tensorflow/lite:create_op_resolver_with_selected_ops.cc")
     else:
         # Support all operators if `models` not specified.
         real_deps.append("//tensorflow/lite/java/src/main/native")
@@ -855,8 +855,8 @@ def tflite_custom_android_library(
         name = "libtensorflowlite_jni.so",
         linkscript = "//tensorflow/lite/java:tflite_version_script.lds",
         deps = [
-            ":%s_cc" % name,
             "//tensorflow/lite/java/src/main/native:native_framework_only",
+            ":%s_cc" % name,  # Placed below native_framework_only to avoid backward reference error.
         ],
     )