Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix generator build layering by correcting deps #215

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions generator/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@ cc_binary(
visibility = ["//visibility:public"],
deps = [
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//src/google/protobuf/compiler:code_generator",
"@com_google_protobuf//src/google/protobuf/io",
"@com_google_protobuf//src/google/protobuf/io:printer",
"@com_google_protobuf//src/google/protobuf/io:tokenizer",
"@com_google_protobuf//:protoc_lib",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
],
)


2 changes: 0 additions & 2 deletions generator/js_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
#include <google/protobuf/io/printer.h>
#include <google/protobuf/io/strtod.h>
#include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/descriptor_legacy.h>
#include "absl/strings/escaping.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/str_format.h"
Expand Down
7 changes: 1 addition & 6 deletions generator/js_generator.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,9 @@
#include <set>
#include <string>

#include <google/protobuf/stubs/common.h>
#include <google/protobuf/compiler/scc.h>
#include <google/protobuf/compiler/code_generator.h>

#include <google/protobuf/port_def.inc>

namespace google {
namespace protobuf {

Expand Down Expand Up @@ -133,7 +130,7 @@ struct GeneratorOptions {
// header. If you create your own protocol compiler binary and you want it to
// support JavaScript output, you can do so by registering an instance of this
// CodeGenerator with the CommandLineInterface in your main() function.
class PROTOC_EXPORT Generator : public CodeGenerator {
class Generator : public CodeGenerator {
public:
Generator() {}
virtual ~Generator() {}
Expand Down Expand Up @@ -331,6 +328,4 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
} // namespace protobuf
} // namespace google

#include <google/protobuf/port_undef.inc>

#endif // GOOGLE_PROTOBUF_COMPILER_JS_GENERATOR_H__
Loading