From db068f6a8442c797d6d34d0da5da585fec2d3599 Mon Sep 17 00:00:00 2001
From: Anna R <annarev@google.com>
Date: Fri, 17 Jan 2020 17:18:48 -0800
Subject: [PATCH] Split out env_var from :lib target.

PiperOrigin-RevId: 290371155
Change-Id: I154d074620d2ce790e43574c0d1192ed9b70156f
---
 tensorflow/core/BUILD           |  2 +-
 tensorflow/core/util/BUILD      | 22 ++++++++++++++++------
 tensorflow/core/util/env_var.cc |  8 ++++----
 tensorflow/core/util/env_var.h  |  4 ++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 412784c8cb2..9503a18c82f 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -1830,7 +1830,6 @@ cc_library(
         ],
     ) + [
         "//tensorflow/core/platform:legacy_lib_internal_srcs",
-        "//tensorflow/core/util:lib_internal_impl_srcs",
     ],
     hdrs = LIB_INTERNAL_PUBLIC_HEADERS,
     copts = tf_copts(),
@@ -1966,6 +1965,7 @@ cc_library(
         "//tensorflow/core/platform:tstring",
         "//tensorflow/core/platform:unbounded_work_queue",
         "//tensorflow/core/platform/default/build_config:platformlib",
+        "//tensorflow/core/util:env_var",
         "//tensorflow/core/util:reporter",  # TODO(gunan): REMOVE as soon as cc_shared_library is supported.
         "@snappy",
         "@zlib_archive//:zlib",
diff --git a/tensorflow/core/util/BUILD b/tensorflow/core/util/BUILD
index 1c6993ff8a3..fe2064f183b 100644
--- a/tensorflow/core/util/BUILD
+++ b/tensorflow/core/util/BUILD
@@ -35,7 +35,6 @@ exports_files(
         "debug_events_writer.h",
         "device_name_utils.h",
         "dump_graph.h",
-        "env_var.h",
         "equal_graph_def.h",
         "events_writer.h",
         "example_proto_fast_parsing.h",
@@ -158,11 +157,6 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "lib_internal_impl_srcs",
-    srcs = ["env_var.cc"],
-)
-
 filegroup(
     name = "framework_internal_private_hdrs",
     srcs = glob(
@@ -478,6 +472,22 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "env_var",
+    srcs = ["env_var.cc"],
+    hdrs = ["env_var.h"],
+    deps = [
+        "//tensorflow/core/platform:errors",
+        "//tensorflow/core/platform:logging",
+        "//tensorflow/core/platform:numbers",
+        "//tensorflow/core/platform:status",
+        "//tensorflow/core/platform:str_util",
+        "//tensorflow/core/platform:strcat",
+        "//tensorflow/core/platform:stringpiece",
+        "//tensorflow/core/platform:types",
+    ],
+)
+
 # Tests.
 
 tf_cc_test(
diff --git a/tensorflow/core/util/env_var.cc b/tensorflow/core/util/env_var.cc
index 7a56f0aef22..0e006e7f4e3 100644
--- a/tensorflow/core/util/env_var.cc
+++ b/tensorflow/core/util/env_var.cc
@@ -17,11 +17,11 @@ limitations under the License.
 
 #include <stdlib.h>
 
-#include "tensorflow/core/lib/core/errors.h"
-#include "tensorflow/core/lib/strings/numbers.h"
-#include "tensorflow/core/lib/strings/str_util.h"
-#include "tensorflow/core/lib/strings/strcat.h"
+#include "tensorflow/core/platform/errors.h"
 #include "tensorflow/core/platform/logging.h"
+#include "tensorflow/core/platform/numbers.h"
+#include "tensorflow/core/platform/str_util.h"
+#include "tensorflow/core/platform/strcat.h"
 
 namespace tensorflow {
 
diff --git a/tensorflow/core/util/env_var.h b/tensorflow/core/util/env_var.h
index 7c9aed6e788..7d10f229102 100644
--- a/tensorflow/core/util/env_var.h
+++ b/tensorflow/core/util/env_var.h
@@ -16,8 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_CORE_UTIL_ENV_VAR_H_
 #define TENSORFLOW_CORE_UTIL_ENV_VAR_H_
 
-#include "tensorflow/core/lib/core/status.h"
-#include "tensorflow/core/lib/core/stringpiece.h"
+#include "tensorflow/core/platform/status.h"
+#include "tensorflow/core/platform/stringpiece.h"
 #include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {