diff options
| author | Paul Yang <TeBoring@users.noreply.github.com> | 2017-04-20 16:55:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 16:55:56 -0700 |
| commit | 4523c9c233dbb61d03996a5bbe25d1b5aea51f7f (patch) | |
| tree | bebedd58dac1966bc462c00dfc39b1fea5deb6c6 /Makefile.am | |
| parent | 4c57e8475f78ccac80407f03c2d23d30014785f9 (diff) | |
| download | protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.tar.gz protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.tar.bz2 protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.zip | |
Allow proto files to import descriptor.proto (#2995)
descriptor.proto uses proto2 syntax, which is not ready for external
usage. However, some proto3 files import descriptor.proto and cannot be
used. In this PR, all references (We cheated by only removing
extensions, which is enough for now. User should avoid using messages
defined in descriptor.proto as field type.) to content in
descriptor.proto are removed from generated files. Those that import
descriptor.proto can be used like other proto files.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 564bff48..d0f033af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -656,6 +656,7 @@ php_EXTRA_DIST= \ php/tests/map_field_test.php \ php/tests/memory_leak_test.php \ php/tests/php_implementation_test.php \ + php/tests/proto/test_import_descriptor_proto.proto \ php/tests/proto/test_include.proto \ php/tests/proto/test.proto \ php/tests/proto/test_prefix.proto \ |