summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPaul Yang <TeBoring@users.noreply.github.com>2018-12-04 15:21:32 -0800
committerGitHub <noreply@github.com>2018-12-04 15:21:32 -0800
commit13c59cb051c4deee5367f9c5fc7b5d07363496a0 (patch)
treed71ca4fa8ee5a0feed15eed99f8da51af21aa1d1 /Makefile
parent9e44a757edb7ba7155469d3305da32b3dc11c756 (diff)
Implement json decoding for Any message. (#130)
* Implement json decoding for Any message. type url may not appear as the first value in json. As a result, other data cannot be resolved before resolving type url. To solve that, this change caches the start and end position of unparsed values and resolve them in end_any_object when type url has been resolved. * Handle Any in switch * Update json parser size * Fix comments * Sync upstream * Add dependency on upb_pb for upb_json * Debug failed test * Fix cmake * Update test generated files * Remove debug tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 3c87d9d..0a17e48 100644
--- a/Makefile
+++ b/Makefile
@@ -191,6 +191,9 @@ endif
upb_json_SRCS = \
upb/json/parser.c \
upb/json/printer.c \
+ upb/pb/encoder.c \
+ upb/pb/varint.c \
+ upb/sink.c \
# Ideally we could keep this uncommented, but Git apparently sometimes skews
# timestamps slightly at "clone" time, which makes "Make" think that it needs
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback