diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2017-05-01 10:58:38 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-01 10:58:38 -0700 |
| commit | 2f4489a3e504e0a4aaffee69b551c6acc9e08374 (patch) | |
| tree | 4cd6e883d0d92f39ebbaa0f6b4bf0f321a165df0 /BUILD | |
| parent | 286f0598422a70639e587b5329bd3037f5ee76b0 (diff) | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
Merge pull request #3024 from acozzette/merge-3.3-to-master
Merged 3.3.x branch to master
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -206,6 +206,7 @@ RELATIVE_WELL_KNOWN_PROTOS = [ "google/protobuf/any.proto", "google/protobuf/api.proto", "google/protobuf/compiler/plugin.proto", + "google/protobuf/compiler/profile.proto", "google/protobuf/descriptor.proto", "google/protobuf/duration.proto", "google/protobuf/empty.proto", @@ -350,6 +351,7 @@ cc_library( "src/google/protobuf/compiler/php/php_generator.cc", "src/google/protobuf/compiler/plugin.cc", "src/google/protobuf/compiler/plugin.pb.cc", + "src/google/protobuf/compiler/profile.pb.cc", "src/google/protobuf/compiler/python/python_generator.cc", "src/google/protobuf/compiler/ruby/ruby_generator.cc", "src/google/protobuf/compiler/subprocess.cc", @@ -401,6 +403,9 @@ RELATIVE_TEST_PROTOS = [ "google/protobuf/unittest_enormous_descriptor.proto", "google/protobuf/unittest_import.proto", "google/protobuf/unittest_import_public.proto", + "google/protobuf/unittest_lazy_dependencies.proto", + "google/protobuf/unittest_lazy_dependencies_custom_option.proto", + "google/protobuf/unittest_lazy_dependencies_enum.proto", "google/protobuf/unittest_lite_imports_nonlite.proto", "google/protobuf/unittest_mset.proto", "google/protobuf/unittest_mset_wire_format.proto", @@ -477,6 +482,7 @@ cc_test( "src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc", "src/google/protobuf/compiler/cpp/cpp_unittest.cc", "src/google/protobuf/compiler/cpp/metadata_test.cc", + "src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc", "src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc", "src/google/protobuf/compiler/importer_unittest.cc", "src/google/protobuf/compiler/java/java_doc_comment_unittest.cc", @@ -543,6 +549,10 @@ cc_test( ":test_plugin", ] + glob([ "src/google/protobuf/**/*", + # Files for csharp_bootstrap_unittest.cc. + "conformance/**/*", + "csharp/src/**/*", + "examples/**/*", ]), includes = [ "src/", |