Merge "Export libtextclassifier"
diff --git a/actions/actions-suggestions.cc b/actions/actions-suggestions.cc
index 1dbae23..8c8fe3f 100644
--- a/actions/actions-suggestions.cc
+++ b/actions/actions-suggestions.cc
@@ -17,7 +17,7 @@
#include "actions/actions-suggestions.h"
#include "utils/base/logging.h"
#include "utils/utf8/unicodetext.h"
-#include "tensorflow/contrib/lite/string_util.h"
+#include "tensorflow/lite/string_util.h"
namespace libtextclassifier3 {
diff --git a/utils/tflite-model-executor.cc b/utils/tflite-model-executor.cc
index 05762d0..4877d4a 100644
--- a/utils/tflite-model-executor.cc
+++ b/utils/tflite-model-executor.cc
@@ -16,8 +16,8 @@
#include "utils/tflite-model-executor.h"
+#include "tensorflow/lite/kernels/register.h"
#include "utils/base/logging.h"
-#include "tensorflow/contrib/lite/kernels/register.h"
// Forward declaration of custom TensorFlow Lite ops for registration.
namespace tflite {
diff --git a/utils/tflite-model-executor.h b/utils/tflite-model-executor.h
index fd00924..ab1e76d 100644
--- a/utils/tflite-model-executor.h
+++ b/utils/tflite-model-executor.h
@@ -21,13 +21,13 @@
#include <memory>
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/op_resolver.h"
+#include "tensorflow/lite/string_util.h"
#include "utils/base/logging.h"
#include "utils/tensor-view.h"
-#include "tensorflow/contrib/lite/interpreter.h"
-#include "tensorflow/contrib/lite/kernels/register.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/op_resolver.h"
-#include "tensorflow/contrib/lite/string_util.h"
namespace libtextclassifier3 {
diff --git a/utils/tflite/dist_diversification.cc b/utils/tflite/dist_diversification.cc
index faf9be0..6dfc329 100644
--- a/utils/tflite/dist_diversification.cc
+++ b/utils/tflite/dist_diversification.cc
@@ -17,9 +17,9 @@
#include "utils/tflite/dist_diversification.h"
#include <algorithm>
-#include "tensorflow/contrib/lite/context.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/context.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/model.h"
namespace libtextclassifier3 {
namespace {
diff --git a/utils/tflite/dist_diversification.h b/utils/tflite/dist_diversification.h
index 924186d..2a9f17e 100644
--- a/utils/tflite/dist_diversification.h
+++ b/utils/tflite/dist_diversification.h
@@ -17,7 +17,7 @@
#ifndef LIBTEXTCLASSIFIER_UTILS_TFLITE_DIST_DIVERSIFICATION_H_
#define LIBTEXTCLASSIFIER_UTILS_TFLITE_DIST_DIVERSIFICATION_H_
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
namespace tflite {
namespace ops {
diff --git a/utils/tflite/dist_diversification_test.cc b/utils/tflite/dist_diversification_test.cc
index 6ed578c..2380116 100644
--- a/utils/tflite/dist_diversification_test.cc
+++ b/utils/tflite/dist_diversification_test.cc
@@ -17,10 +17,10 @@
#include "utils/tflite/dist_diversification.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
-#include "tensorflow/contrib/lite/interpreter.h"
-#include "tensorflow/contrib/lite/kernels/register.h"
-#include "tensorflow/contrib/lite/kernels/test_util.h"
-#include "tensorflow/contrib/lite/model.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/kernels/test_util.h"
+#include "tensorflow/lite/model.h"
namespace libtextclassifier3 {
namespace {
diff --git a/utils/tflite/text_encoder.cc b/utils/tflite/text_encoder.cc
index abc472e..52e74c8 100644
--- a/utils/tflite/text_encoder.cc
+++ b/utils/tflite/text_encoder.cc
@@ -27,9 +27,9 @@
#include "utils/tflite/text_encoder_config_generated.h"
#include "flatbuffers/flatbuffers.h"
#include "flatbuffers/flexbuffers.h"
-#include "tensorflow/contrib/lite/kernels/kernel_util.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/string_util.h"
+#include "tensorflow/lite/kernels/kernel_util.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/string_util.h"
namespace libtextclassifier3 {
namespace {
diff --git a/utils/tflite/text_encoder.h b/utils/tflite/text_encoder.h
index 1143031..9dce6db 100644
--- a/utils/tflite/text_encoder.h
+++ b/utils/tflite/text_encoder.h
@@ -17,7 +17,7 @@
#ifndef LIBTEXTCLASSIFIER_UTILS_TFLITE_TEXT_ENCODER_H_
#define LIBTEXTCLASSIFIER_UTILS_TFLITE_TEXT_ENCODER_H_
-#include "tensorflow/contrib/lite/context.h"
+#include "tensorflow/lite/context.h"
namespace tflite {
namespace ops {
diff --git a/utils/tflite/text_encoder_test.cc b/utils/tflite/text_encoder_test.cc
index 0cd67ce..bf406e9 100644
--- a/utils/tflite/text_encoder_test.cc
+++ b/utils/tflite/text_encoder_test.cc
@@ -22,11 +22,11 @@
#include "gtest/gtest.h"
#include "third_party/absl/flags/flag.h"
#include "flatbuffers/flexbuffers.h"
-#include "tensorflow/contrib/lite/interpreter.h"
-#include "tensorflow/contrib/lite/kernels/register.h"
-#include "tensorflow/contrib/lite/kernels/test_util.h"
-#include "tensorflow/contrib/lite/model.h"
-#include "tensorflow/contrib/lite/string_util.h"
+#include "tensorflow/lite/interpreter.h"
+#include "tensorflow/lite/kernels/register.h"
+#include "tensorflow/lite/kernels/test_util.h"
+#include "tensorflow/lite/model.h"
+#include "tensorflow/lite/string_util.h"
namespace libtextclassifier3 {
namespace {
