Attachment #655380 for bug #705712

Lines 26-32 limitations under the License. Link Here

(-)a/tensorflow/core/platform/cloud/gcs_file_system.cc (-1 / +1 lines)
26	#include <io.h> // for _mktemp	26	#include <io.h> // for _mktemp
27	#endif	27	#endif
28	#include "absl/base/macros.h"	28	#include "absl/base/macros.h"
29	#include "include/json/json.h"	29	#include "jsoncpp/json/json.h"
30	#include "tensorflow/core/lib/gtl/map_util.h"	30	#include "tensorflow/core/lib/gtl/map_util.h"
31	#include "tensorflow/core/platform/cloud/curl_http_request.h"	31	#include "tensorflow/core/platform/cloud/curl_http_request.h"
32	#include "tensorflow/core/platform/cloud/file_block_cache.h"	32	#include "tensorflow/core/platform/cloud/file_block_cache.h"

Lines 24-30 limitations under the License. Link Here

(-)a/tensorflow/core/platform/cloud/google_auth_provider.cc (-1 / +1 lines)
24	#include <utility>	24	#include <utility>
25		25
26	#include "absl/strings/match.h"	26	#include "absl/strings/match.h"
27	#include "include/json/json.h"	27	#include "jsoncpp/json/json.h"
28	#include "tensorflow/core/platform/base64.h"	28	#include "tensorflow/core/platform/base64.h"
29	#include "tensorflow/core/platform/env.h"	29	#include "tensorflow/core/platform/env.h"
30	#include "tensorflow/core/platform/errors.h"	30	#include "tensorflow/core/platform/errors.h"

Lines 18-24 limitations under the License. Link Here

(-)a/tensorflow/core/platform/cloud/oauth_client.h (-1 / +1 lines)
18		18
19	#include <memory>	19	#include <memory>
20		20
21	#include "include/json/json.h"	21	#include "jsoncpp/json/json.h"
22	#include "tensorflow/core/platform/cloud/http_request.h"	22	#include "tensorflow/core/platform/cloud/http_request.h"
23	#include "tensorflow/core/platform/env.h"	23	#include "tensorflow/core/platform/env.h"
24	#include "tensorflow/core/platform/status.h"	24	#include "tensorflow/core/platform/status.h"

Lines 17-23 limitations under the License. Link Here

(-)a/tensorflow/core/profiler/convert/trace_events_to_json.cc (-1 / +1 lines)
17		17
18	#include "absl/strings/str_cat.h"	18	#include "absl/strings/str_cat.h"
19	#include "absl/strings/str_format.h"	19	#include "absl/strings/str_format.h"
20	#include "include/json/json.h"	20	#include "jsoncpp/json/json.h"
21	#include "tensorflow/core/protobuf/trace_events.pb.h"	21	#include "tensorflow/core/protobuf/trace_events.pb.h"
22		22
23	namespace tensorflow {	23	namespace tensorflow {

Lines 15-21 limitations under the License. Link Here

(-)a/tensorflow/core/profiler/convert/trace_events_to_json_test.cc (-1 / +1 lines)
15		15
16	#include "tensorflow/core/profiler/convert/trace_events_to_json.h"	16	#include "tensorflow/core/profiler/convert/trace_events_to_json.h"
17		17
18	#include "include/json/json.h"	18	#include "jsoncpp/json/json.h"
19	#include "tensorflow/core/platform/protobuf.h"	19	#include "tensorflow/core/platform/protobuf.h"
20	#include "tensorflow/core/platform/test.h"	20	#include "tensorflow/core/platform/test.h"
21	#include "tensorflow/core/protobuf/trace_events.pb.h"	21	#include "tensorflow/core/protobuf/trace_events.pb.h"

Lines 17-23 limitations under the License. Link Here

(-)a/tensorflow/core/profiler/internal/tfprof_timeline.h (-1 / +1 lines)
17	#define TENSORFLOW_CORE_PROFILER_INTERNAL_TFPROF_TIMELINE_H_	17	#define TENSORFLOW_CORE_PROFILER_INTERNAL_TFPROF_TIMELINE_H_
18		18
19	#include "absl/strings/str_cat.h"	19	#include "absl/strings/str_cat.h"
20	#include "include/json/json.h"	20	#include "jsoncpp/json/json.h"
21	#include "tensorflow/core/framework/graph.pb.h"	21	#include "tensorflow/core/framework/graph.pb.h"
22	#include "tensorflow/core/framework/step_stats.pb.h"	22	#include "tensorflow/core/framework/step_stats.pb.h"
23	#include "tensorflow/core/profiler/internal/tfprof_node_show.h"	23	#include "tensorflow/core/profiler/internal/tfprof_node_show.h"

Lines 26-32 cc_library( Link Here

(-)a/third_party/jsoncpp.BUILD (+2 lines)
26	"-DJSON_USE_EXCEPTION=0",	26	"-DJSON_USE_EXCEPTION=0",
27	"-DJSON_HAS_INT64",	27	"-DJSON_HAS_INT64",
28	],	28	],
		29	include_prefix = "jsoncpp",
29	includes = ["include"],	30	includes = ["include"],
		31	strip_include_prefix = "include",
30	visibility = ["//visibility:public"],	32	visibility = ["//visibility:public"],
31	deps = [":private"],	33	deps = [":private"],
32	)	34	)




    visibility = ["//visibility:public"],
)

HEADERS = [
    "include/json/allocator.h",
    "include/json/assertions.h",
    "include/json/autolink.h",
    "include/json/config.h",
    "include/json/features.h",
    "include/json/forwards.h",
    "include/json/json.h",
    "include/json/reader.h",
    "include/json/value.h",
    "include/json/version.h",
    "include/json/writer.h",
]

genrule(
    name = "link_headers",
    outs = HEADERS,
    cmd = """
      for i in $(OUTS); do
        i=$${i##*/}
        ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
      done
    """,
)

cc_library(
    name = "jsoncpp",
    hdrs = HEADERS,
    includes = ["."],
    linkopts = ["-ljsoncpp"],
    visibility = ["//visibility:public"],
)
- 

Return to bug 705712

Lines 5-39 filegroup( Link Here

(-)a/third_party/systemlibs/jsoncpp.BUILD (-28 lines)
5	visibility = ["//visibility:public"],	5	visibility = ["//visibility:public"],
6	)	6	)
7		7
8	HEADERS = [
9	"include/json/allocator.h",
10	"include/json/assertions.h",
11	"include/json/autolink.h",
12	"include/json/config.h",
13	"include/json/features.h",
14	"include/json/forwards.h",
15	"include/json/json.h",
16	"include/json/reader.h",
17	"include/json/value.h",
18	"include/json/version.h",
19	"include/json/writer.h",
20	]
21
22	genrule(
23	name = "link_headers",
24	outs = HEADERS,
25	cmd = """
26	for i in $(OUTS); do
27	i=$${i##*/}
28	ln -sf $(INCLUDEDIR)/jsoncpp/json/$$i $(@D)/include/json/$$i
29	done
30	""",
31	)
32
33	cc_library(	8	cc_library(
34	name = "jsoncpp",	9	name = "jsoncpp",
35	hdrs = HEADERS,
36	includes = ["."],
37	linkopts = ["-ljsoncpp"],	10	linkopts = ["-ljsoncpp"],
38	visibility = ["//visibility:public"],	11	visibility = ["//visibility:public"],
39	)	12	)
40	-