-
Notifications
You must be signed in to change notification settings - Fork 494
Expand file tree
/
Copy pathprotobuf_javascript.patch
More file actions
27 lines (25 loc) · 1.05 KB
/
protobuf_javascript.patch
File metadata and controls
27 lines (25 loc) · 1.05 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
diff --git a/generator/BUILD.bazel b/generator/BUILD.bazel
index ac7756d..a3480c8 100644
--- a/generator/BUILD.bazel
+++ b/generator/BUILD.bazel
@@ -2,7 +2,7 @@ genrule(
name = "generate_version_header",
srcs = ["//:package.json"],
outs = ["version.h"],
- cmd = "node $(location //:generate-version-header.js) $(OUTS)",
+ cmd = "/opt/px_dev/tools/node/bin/node $(location //:generate-version-header.js) $(OUTS)",
tools = ["//:generate-version-header.js"],
)
diff --git a/generator/js_generator.cc b/generator/js_generator.cc
index 7ba8bf0..09b1391 100644
--- a/generator/js_generator.cc
+++ b/generator/js_generator.cc
@@ -3647,6 +3647,9 @@ void Generator::GenerateFile(const GeneratorOptions& options,
for (int i = 0; i < file->dependency_count(); i++) {
const std::string name = std::string(file->dependency(i)->name());
+ if (ModuleAlias(name) == "gogoproto_gogo_pb") {
+ continue;
+ }
printer->Print(
"var $alias$ = require('$file$');\n"
"goog.object.extend(proto, $alias$);\n",