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

Unified Diff: third_party/protobuf/BUILD.gn

Issue 1929963004: Revert of Split protoc into library and executable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/protobuf.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/protobuf/BUILD.gn
diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
index 85cca239fdf482ff5fd79e5f3384338ad071f329..e4520ec1473d5eb090d1ac311fa489f7938a2154 100644
--- a/third_party/protobuf/BUILD.gn
+++ b/third_party/protobuf/BUILD.gn
@@ -329,7 +329,7 @@
# Only compile the compiler for the host architecture.
if (current_toolchain == host_toolchain) {
- source_set("protoc_lib") {
+ executable("protoc") {
sources = [
"src/google/protobuf/compiler/code_generator.cc",
"src/google/protobuf/compiler/code_generator.h",
@@ -476,6 +476,7 @@
"src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
"src/google/protobuf/compiler/js/js_generator.cc",
"src/google/protobuf/compiler/js/js_generator.h",
+ "src/google/protobuf/compiler/main.cc",
"src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
"src/google/protobuf/compiler/objectivec/objectivec_enum.h",
"src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
@@ -527,31 +528,16 @@
configs -= [ "//build/config/win:lean_and_mean" ]
}
- public_configs = [ ":protobuf_config" ]
-
cflags = protobuf_lite_cflags
- public_deps = [
+ deps = [
":protobuf_full",
- ]
- }
-
- executable("protoc") {
- sources = [
- "src/google/protobuf/compiler/main.cc",
- ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += ["//build/config/compiler:no_chromium_code"]
-
- cflags = protobuf_lite_cflags
-
- deps = [
- ":protoc_lib",
+ "//build/config/sanitizers:deps",
# Default manifest on Windows (a no-op elsewhere).
"//build/win:default_exe_manifest",
]
+ deps += [ "//build/config/sanitizers:deps" ]
}
}
« no previous file with comments | « no previous file | third_party/protobuf/protobuf.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698