commit 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74
author Adam Cozzette <acozzette@google.com> Thu Nov 17 16:48:38 2016 -0800
committer Adam Cozzette <acozzette@google.com> Thu Nov 17 16:59:59 2016 -0800
tree 0276f81f8848a05d84cd7e287b43d665e30f04e3
parent e28286fa05d8327fd6c5aa70cfb3be558f0932b8

Integrated internal changes from Google

src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index faee6d9..b3a667a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,6 +161,7 @@
   google/protobuf/compiler/java/java_names.h                    \
   google/protobuf/compiler/javanano/javanano_generator.h        \
   google/protobuf/compiler/js/js_generator.h                    \
+  google/protobuf/compiler/js/well_known_types_embed.h          \
   google/protobuf/compiler/objectivec/objectivec_generator.h    \
   google/protobuf/compiler/objectivec/objectivec_helpers.h      \
   google/protobuf/compiler/php/php_generator.h                  \
@@ -399,6 +400,7 @@
   google/protobuf/compiler/java/java_doc_comment.cc            \
   google/protobuf/compiler/java/java_doc_comment.h             \
   google/protobuf/compiler/js/js_generator.cc                  \
+  google/protobuf/compiler/js/well_known_types_embed.cc        \
   google/protobuf/compiler/javanano/javanano_enum.cc           \
   google/protobuf/compiler/javanano/javanano_enum.h            \
   google/protobuf/compiler/javanano/javanano_enum_field.cc     \