commit 614c2bf99b1865761e5a05a56faf1ad8f26138ff
author Nicolas Noble <nnoble@google.com> Wed Jan 21 15:48:36 2015 -0800
committer Nicolas Noble <nnoble@google.com> Thu Jan 22 15:32:02 2015 -0800
tree 4130b19697754e535c1b91cb436d5b8b54c1e908
parent 85eea08ba8109dc9bd2b798146a5140342505f77

Replacing cJSON with our own code instead.

Makefile

diff --git a/Makefile b/Makefile
index 1fefcfd..c68a412 100644
--- a/Makefile
+++ b/Makefile
@@ -1365,6 +1365,8 @@
     src/core/iomgr/tcp_posix.c \
     src/core/iomgr/tcp_server_posix.c \
     src/core/iomgr/time_averaged_stats.c \
+    src/core/json/json.c \
+    src/core/json/json-string.c \
     src/core/statistics/census_init.c \
     src/core/statistics/census_log.c \
     src/core/statistics/census_rpc_stats.c \
@@ -1406,7 +1408,6 @@
     src/core/transport/metadata.c \
     src/core/transport/stream_op.c \
     src/core/transport/transport.c \
-    third_party/cJSON/cJSON.c \
 
 PUBLIC_HEADERS_C += \
     include/grpc/grpc_security.h \
@@ -1483,6 +1484,8 @@
 src/core/iomgr/tcp_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/tcp_server_posix.c: $(OPENSSL_DEP)
 src/core/iomgr/time_averaged_stats.c: $(OPENSSL_DEP)
+src/core/json/json.c: $(OPENSSL_DEP)
+src/core/json/json-string.c: $(OPENSSL_DEP)
 src/core/statistics/census_init.c: $(OPENSSL_DEP)
 src/core/statistics/census_log.c: $(OPENSSL_DEP)
 src/core/statistics/census_rpc_stats.c: $(OPENSSL_DEP)
@@ -1524,7 +1527,6 @@
 src/core/transport/metadata.c: $(OPENSSL_DEP)
 src/core/transport/stream_op.c: $(OPENSSL_DEP)
 src/core/transport/transport.c: $(OPENSSL_DEP)
-third_party/cJSON/cJSON.c: $(OPENSSL_DEP)
 endif
 
 libs/$(CONFIG)/libgrpc.a: $(ZLIB_DEP) $(OPENSSL_DEP) $(LIBGRPC_OBJS)
@@ -1618,6 +1620,8 @@
 objs/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
+objs/$(CONFIG)/src/core/json/json.o: 
+objs/$(CONFIG)/src/core/json/json-string.o: 
 objs/$(CONFIG)/src/core/statistics/census_init.o: 
 objs/$(CONFIG)/src/core/statistics/census_log.o: 
 objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
@@ -1659,7 +1663,6 @@
 objs/$(CONFIG)/src/core/transport/metadata.o: 
 objs/$(CONFIG)/src/core/transport/stream_op.o: 
 objs/$(CONFIG)/src/core/transport/transport.o: 
-objs/$(CONFIG)/third_party/cJSON/cJSON.o: 
 
 
 LIBGRPC_TEST_UTIL_SRC = \
@@ -1773,6 +1776,8 @@
     src/core/iomgr/tcp_posix.c \
     src/core/iomgr/tcp_server_posix.c \
     src/core/iomgr/time_averaged_stats.c \
+    src/core/json/json.c \
+    src/core/json/json-string.c \
     src/core/statistics/census_init.c \
     src/core/statistics/census_log.c \
     src/core/statistics/census_rpc_stats.c \
@@ -1814,7 +1819,6 @@
     src/core/transport/metadata.c \
     src/core/transport/stream_op.c \
     src/core/transport/transport.c \
-    third_party/cJSON/cJSON.c \
 
 PUBLIC_HEADERS_C += \
     include/grpc/byte_buffer.h \
@@ -1891,6 +1895,8 @@
 objs/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
 objs/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
+objs/$(CONFIG)/src/core/json/json.o: 
+objs/$(CONFIG)/src/core/json/json-string.o: 
 objs/$(CONFIG)/src/core/statistics/census_init.o: 
 objs/$(CONFIG)/src/core/statistics/census_log.o: 
 objs/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
@@ -1932,7 +1938,6 @@
 objs/$(CONFIG)/src/core/transport/metadata.o: 
 objs/$(CONFIG)/src/core/transport/stream_op.o: 
 objs/$(CONFIG)/src/core/transport/transport.o: 
-objs/$(CONFIG)/third_party/cJSON/cJSON.o: 
 
 
 LIBGRPC++_SRC = \