From 878acbdc4ff6de45521f01522082bf28f95d4451 Mon Sep 17 00:00:00 2001
From: Abhishek Kulkarni <abhishek.kulkarni@intel.com>
Date: Mon, 14 Sep 2020 12:05:07 -0700
Subject: [PATCH] Add back nlohmann_json_lib dep needed by google-cloud-cpp

---
 tensorflow/opensource_only.files |  2 ++
 tensorflow/workspace.bzl         | 11 +++++++++++
 third_party/nlohmann_json.BUILD  |  1 +
 3 files changed, 14 insertions(+)

diff --git a/tensorflow/opensource_only.files b/tensorflow/opensource_only.files
index fe5258f4fa5..c631ea0d8ec 100644
--- a/tensorflow/opensource_only.files
+++ b/tensorflow/opensource_only.files
@@ -137,6 +137,7 @@ tensorflow/third_party/nccl/archive.patch
 tensorflow/third_party/nccl/build_defs.bzl.tpl
 tensorflow/third_party/nccl/nccl_configure.bzl
 tensorflow/third_party/nccl/system.BUILD.tpl
+tensorflow/third_party/nlohmann_json.BUILD
 tensorflow/third_party/opt_einsum.BUILD
 tensorflow/third_party/pcre.BUILD
 tensorflow/third_party/png.BUILD
@@ -374,3 +375,4 @@ tensorflow/tools/pip_package/simple_console_for_windows.py
 tensorflow/tools/pip_package/xla_build/CMakeLists.txt
 tensorflow/virtual_root_template_v1.__init__.py
 tensorflow/virtual_root_template_v2.__init__.py
+
diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index a86a4145df5..b041ddc3e7b 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -1109,6 +1109,17 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
         ],
     )
 
+    tf_http_archive(
+        name = "nlohmann_json_lib",
+        build_file = clean_dep("//third_party:nlohmann_json.BUILD"),
+        sha256 = "c377963a95989270c943d522bfefe7b889ef5ed0e1e15d535fd6f6f16ed70732",
+        strip_prefix = "json-3.4.0",
+        urls = [
+            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/nlohmann/json/archive/v3.4.0.tar.gz",
+            "https://github.com/nlohmann/json/archive/v3.4.0.tar.gz",
+        ],
+    )
+
     tf_http_archive(
         name = "pybind11",
         urls = [
diff --git a/third_party/nlohmann_json.BUILD b/third_party/nlohmann_json.BUILD
index 1d8fa92e9c1..26eae8c93b0 100644
--- a/third_party/nlohmann_json.BUILD
+++ b/third_party/nlohmann_json.BUILD
@@ -5,6 +5,7 @@ exports_files(["LICENSE.MIT"])
 cc_library(
     name = "nlohmann_json_lib",
     hdrs = glob([
+        "include/nlohmann/*.hpp",
         "include/nlohmann/**/*.hpp",
     ]),
     copts = [