Automated rollback of commit 194e793

PiperOrigin-RevId: 267410294
tensorflow · Sep 5, 2019 · 01ccbd7 · 01ccbd7
1 parent 4fd156b
commit 01ccbd7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 42 deletions.
diff --git a/tensorflow/contrib/makefile/proto_text_cc_files.txt b/tensorflow/contrib/makefile/proto_text_cc_files.txt
@@ -34,7 +34,6 @@ tensorflow/core/lib/strings/ordered_code.cc
 tensorflow/core/lib/strings/proto_text_util.cc
 tensorflow/core/lib/wav/wav_io.cc
 tensorflow/core/platform/cpu_info.cc
-tensorflow/core/platform/default/env_time.cc
 tensorflow/core/platform/default/logging.cc
 tensorflow/core/platform/default/mutex.cc
 tensorflow/core/platform/default/tracing.cc
@@ -44,6 +43,7 @@ tensorflow/core/platform/file_system.cc
 tensorflow/core/platform/file_system_helper.cc
 tensorflow/core/platform/numbers.cc
 tensorflow/core/platform/posix/env.cc
+tensorflow/core/platform/posix/env_time.cc
 tensorflow/core/platform/posix/error.cc
 tensorflow/core/platform/posix/load_library.cc
 tensorflow/core/platform/posix/port.cc

diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD
@@ -29,7 +29,6 @@ load(
 load(
     "//tensorflow/core/platform:default/build_refactor.bzl",
     "tf_instantiate_platform_libraries",
-    "tf_platform_helper_deps",
 )
 load(
     "//tensorflow:tensorflow.bzl",
@@ -51,7 +50,6 @@ package(
 tf_instantiate_platform_libraries(names = [
     "context",
     "cord",
-    "env_time",
 ])
 
 cc_library(
@@ -137,8 +135,11 @@ cc_library(
 
 cc_library(
     name = "env_time",
-    textual_hdrs = ["env_time.h"],
-    deps = tf_platform_helper_deps("env_time_impl"),
+    srcs = tf_platform_srcs(["env_time.cc"]),
+    hdrs = ["env_time.h"],
+    deps = [
+        ":types",
+    ],
 )
 
 cc_library(

diff --git a/tensorflow/core/platform/default/build_refactor.bzl b/tensorflow/core/platform/default/build_refactor.bzl
@@ -22,45 +22,8 @@ TF_PLATFORM_LIBRARIES = {
         "hdrs": ["//tensorflow/core/platform:default/cord.h"],
         "visibility": ["//visibility:private"],
     },
-    "env_time": {
-        "name": "env_time_impl",
-        "hdrs": [
-            "//tensorflow/core/platform:env_time.h",
-        ],
-        "srcs": [
-            "//tensorflow/core/platform:default/env_time.cc",
-        ],
-        "deps": [
-            "//tensorflow/core/platform:types",
-        ],
-        "visibility": ["//visibility:private"],
-    },
-}
-
-TF_WINDOWS_PLATFORM_LIBRARIES = {
-    "env_time": {
-        "name": "windows_env_time_impl",
-        "hdrs": [
-            "//tensorflow/core/platform:env_time.h",
-        ],
-        "srcs": [
-            "//tensorflow/core/platform:windows/env_time.cc",
-        ],
-        "deps": [
-            "//tensorflow/core/platform:types",
-        ],
-        "visibility": ["//visibility:private"],
-    },
 }
 
 def tf_instantiate_platform_libraries(names = []):
     for name in names:
         native.cc_library(**TF_PLATFORM_LIBRARIES[name])
-        if name in TF_WINDOWS_PLATFORM_LIBRARIES:
-            native.cc_library(**TF_WINDOWS_PLATFORM_LIBRARIES[name])
-
-def tf_platform_helper_deps(name):
-    return select({
-        "//tensorflow:windows": [":windows_" + name],
-        "//conditions:default": [":" + name],
-    })
diff --git a/tensorflow/core/platform/default/env_time.cc → tensorflow/core/platform/posix/env_time.cc b/tensorflow/core/platform/default/env_time.cc → tensorflow/core/platform/posix/env_time.cc