Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(325)

Unified Diff: third_party/dom_distiller_js/BUILD.gn

Issue 2343833002: Remove workaround from GN proto_library. (Closed)
Patch Set: typo Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/protobuf/proto_library.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/dom_distiller_js/BUILD.gn
diff --git a/third_party/dom_distiller_js/BUILD.gn b/third_party/dom_distiller_js/BUILD.gn
index bbedfacdbefe69e5cbf15ba8993fcacb241f3719..ddd14d982132092d1c035384defed1406ed2b914 100644
--- a/third_party/dom_distiller_js/BUILD.gn
+++ b/third_party/dom_distiller_js/BUILD.gn
@@ -15,6 +15,7 @@ group("proto") {
protoc_plugin_files = [
"protoc_plugins/json_values_converter.bat",
+ "protoc_plugins/json_values_converter.py",
"protoc_plugins/util/__init__.py",
"protoc_plugins/util/plugin_protos.py",
"protoc_plugins/util/types.py",
@@ -22,9 +23,9 @@ protoc_plugin_files = [
]
if (is_win) {
- json_converter = "protoc_plugins/json_values_converter.bat"
+ json_converter_plugin_script = "protoc_plugins/json_values_converter.bat"
} else {
- json_converter = "protoc_plugins/json_values_converter.py"
+ json_converter_plugin_script = "protoc_plugins/json_values_converter.py"
}
proto_library("dom_distiller_proto") {
@@ -33,10 +34,11 @@ proto_library("dom_distiller_proto") {
"dist/proto/dom_distiller.proto",
]
proto_out_dir = "third_party/dom_distiller_js"
- json_converter = json_converter
- # Depends on protoc_plugins properly
- inputs = protoc_plugin_files
+ generator_plugin_script = json_converter_plugin_script
+ generator_plugin_script_deps = protoc_plugin_files
+ generator_plugin_suffixes = [ "_json_converter.h" ]
+ generator_plugin_options = "output_dir=:"
}
# The purpose of json_values_converter_test_proto is to test the
@@ -47,10 +49,11 @@ proto_library("json_values_converter_test_proto") {
"test_sample.proto",
]
proto_out_dir = "third_party/dom_distiller_js"
- json_converter = json_converter
- # Depends on protoc_plugins properly
- inputs = protoc_plugin_files
+ generator_plugin_script = json_converter_plugin_script
+ generator_plugin_script_deps = protoc_plugin_files
+ generator_plugin_suffixes = [ "_json_converter.h" ]
+ generator_plugin_options = "output_dir=:"
}
action("json_values_converter_tests") {
« no previous file with comments | « no previous file | third_party/protobuf/proto_library.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698