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

Unified Diff: third_party/protobuf/BUILD.gn

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 4 years 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 | « third_party/protobuf/BUILD ('k') | third_party/protobuf/CHANGES.txt » ('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 52cf25ee22161e4deac5c8b282b76207e9e17c41..84c916a651e8347ae93661d3056337fe4a060e7d 100644
--- a/third_party/protobuf/BUILD.gn
+++ b/third_party/protobuf/BUILD.gn
@@ -52,7 +52,6 @@ protobuf_lite_sources = [
"src/google/protobuf/io/zero_copy_stream.h",
"src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
"src/google/protobuf/io/zero_copy_stream_impl_lite.h",
- "src/google/protobuf/has_bits.h",
"src/google/protobuf/map.h",
"src/google/protobuf/map_entry_lite.h",
"src/google/protobuf/map_field_lite.h",
@@ -66,10 +65,10 @@ protobuf_lite_sources = [
"src/google/protobuf/stubs/atomicops_internals_arm_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_arm_qnx.h",
"src/google/protobuf/stubs/atomicops_internals_atomicword_compat.h",
- "src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h",
"src/google/protobuf/stubs/atomicops_internals_generic_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_macosx.h",
"src/google/protobuf/stubs/atomicops_internals_mips_gcc.h",
+ "src/google/protobuf/stubs/atomicops_internals_pnacl.h",
"src/google/protobuf/stubs/atomicops_internals_power.h",
"src/google/protobuf/stubs/atomicops_internals_ppc_gcc.h",
"src/google/protobuf/stubs/atomicops_internals_solaris.h",
@@ -164,10 +163,6 @@ component("protobuf_lite") {
"//build/config/sanitizers:deps",
]
- if (is_android) {
- libs = [ "log" ] # Used by src/google/protobuf/stubs/common.cc
- }
-
cflags = protobuf_lite_cflags
# Required for component builds. See http://crbug.com/172800.
@@ -317,10 +312,6 @@ static_library("protobuf_full") {
"//build/config/sanitizers:deps",
]
- if (is_android) {
- libs = [ "log" ] # Used by src/google/protobuf/stubs/common.cc
- }
-
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
"//build/config/compiler:no_chromium_code",
@@ -461,7 +452,6 @@ if (current_toolchain == host_toolchain) {
"src/google/protobuf/compiler/java/java_message_lite.h",
"src/google/protobuf/compiler/java/java_name_resolver.cc",
"src/google/protobuf/compiler/java/java_name_resolver.h",
- "src/google/protobuf/compiler/java/java_options.h",
"src/google/protobuf/compiler/java/java_primitive_field.cc",
"src/google/protobuf/compiler/java/java_primitive_field.h",
"src/google/protobuf/compiler/java/java_primitive_field_lite.cc",
@@ -496,11 +486,8 @@ if (current_toolchain == host_toolchain) {
"src/google/protobuf/compiler/javanano/javanano_message_field.h",
"src/google/protobuf/compiler/javanano/javanano_primitive_field.cc",
"src/google/protobuf/compiler/javanano/javanano_primitive_field.h",
- "src/google/protobuf/compiler/js/embed.cc",
"src/google/protobuf/compiler/js/js_generator.cc",
"src/google/protobuf/compiler/js/js_generator.h",
- "src/google/protobuf/compiler/js/well_known_types_embed.cc",
- "src/google/protobuf/compiler/js/well_known_types_embed.h",
"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",
@@ -525,8 +512,6 @@ if (current_toolchain == host_toolchain) {
"src/google/protobuf/compiler/objectivec/objectivec_oneof.h",
"src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
"src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h",
- "src/google/protobuf/compiler/php/php_generator.cc",
- "src/google/protobuf/compiler/php/php_generator.h",
"src/google/protobuf/compiler/plugin.cc",
"src/google/protobuf/compiler/plugin.h",
"src/google/protobuf/compiler/plugin.pb.cc",
@@ -580,15 +565,6 @@ if (current_toolchain == host_toolchain) {
"//build/win:default_exe_manifest",
]
}
-
- executable("js_embed") {
- sources = [
- "src/google/protobuf/compiler/js/embed.cc",
- ]
-
- configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ "//build/config/compiler:no_chromium_code" ]
- }
}
google_python_dir = "$root_out_dir/pyproto/google"
« no previous file with comments | « third_party/protobuf/BUILD ('k') | third_party/protobuf/CHANGES.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698