Protobuf: Remove protobuf globals patch

third_party/protobuf/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 config("protobuf_config") {
   include_dirs = [ "src" ]
   defines = [
     "GOOGLE_PROTOBUF_NO_RTTI",
     "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
   ]
@@ skipping 18 matching lines @@
 
 # This config should be applied to targets using generated code from the proto
 # compiler. It sets up the include directories properly.
 config("using_proto") {
   include_dirs = [
     "src",
     "$root_gen_dir/protoc_out",
   ]
 }
 
-protobuf_globals_sources = [
-  "src/google/protobuf/globals.cc",
-  "src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
-]
-
 protobuf_lite_sources = [
   "src/google/protobuf/arena.cc",
   "src/google/protobuf/arena.h",
   "src/google/protobuf/arenastring.cc",
   "src/google/protobuf/arenastring.h",
   "src/google/protobuf/extension_set.cc",
   "src/google/protobuf/extension_set.h",
   "src/google/protobuf/generated_message_util.cc",
   "src/google/protobuf/generated_message_util.h",
   "src/google/protobuf/io/coded_stream.cc",
@@ skipping 17 matching lines @@
   "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_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",
   "src/google/protobuf/stubs/atomicops_internals_tsan.h",
+  "src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc",
   "src/google/protobuf/stubs/atomicops_internals_x86_gcc.h",
   "src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc",
   "src/google/protobuf/stubs/atomicops_internals_x86_msvc.h",
   "src/google/protobuf/stubs/atomic_sequence_num.h",
   "src/google/protobuf/stubs/bytestream.cc",
   "src/google/protobuf/stubs/bytestream.h",
   "src/google/protobuf/stubs/callback.h",
   "src/google/protobuf/stubs/casts.h",
   "src/google/protobuf/stubs/common.cc",
   "src/google/protobuf/stubs/common.h",
@@ skipping 48 matching lines @@
     "/wd4715",  # not all control paths return a value (fixed in trunk)
   ]
 }
 
 # Do not allow libprotobuf_lite to be dynamically linked on Linux.  Later
 # versions of Ubuntu like Xenial and Yakkety link in the system
 # libprotobuf_lite by the following dependency chain: chrome -> gtk ->
 # libmirclient -> libmirprotobuf -> libprotobuf-lite.  Trying to load
 # the system libprotobuf-lite after already having loaded the libprotobuf_lite
 # component will result in an immediate crash. (crbug.com/700120)
-if (is_linux && !is_chromeos) {
-  link_target_type = "static_library"
-} else {
-  link_target_type = "component"
-}
-
-if (is_component_build && is_linux && !is_chromeos) {
-  # Even though protobuf is statically linked on Linux, global data must
-  # be shared across different copies of the library in each component.
-  # protobuf_globals is a shared library that provides this state, but is
-  # careful to prefix all exported symbols with 'cr_' so they don't conflict
-  # with other versions of protobuf.
-  component("protobuf_globals") {
-    configs += [
-      ":protobuf_config",
-      ":protobuf_use_dlls",
+if (is_component_build && is_desktop_linux) {
+  shared_library("mirclient") {
+    inputs = [
+      "mirclient.map",
     ]
-    defines = [ "LIBPROTOBUF_EXPORTS" ]
-    sources = protobuf_globals_sources
+    sources = [
+      "mirclient.cc",
+    ]
+    ldflags = [ "-Wl,--version-script=" +
+                rebase_path("//third_party/protobuf/mirclient.map") ]
+    output_extension = "so.9"
   }
 }
 
-target(link_target_type, "protobuf_lite") {
+component("protobuf_lite") {
   sources = protobuf_lite_sources
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     "//build/config/compiler:no_chromium_code",
 
     # Must be after no_chromium_code for warning flags to be ordered
     # correctly.
     ":protobuf_warnings",
   ]
 
   if (is_win) {
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
 
   public_configs = [
     ":protobuf_config",
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   deps = [
     "//build/config/sanitizers:deps",
   ]
 
   cflags = protobuf_lite_cflags
 
-  if (is_component_build && is_linux && !is_chromeos) {
-    deps += [ ":protobuf_globals" ]
-  } else {
-    sources += protobuf_globals_sources
+  if (is_component_build && is_desktop_linux) {
+    deps += [ ":mirclient" ]
   }
 
   # Required for component builds. See http://crbug.com/172800.
   if (is_component_build) {
     public_configs += [ ":protobuf_use_dlls" ]
-    if (!is_linux || is_chromeos) {
-      defines = [ "LIBPROTOBUF_EXPORTS" ]
-    }
+    defines = [ "LIBPROTOBUF_EXPORTS" ]
   }
 }
 
 # This is the full, heavy protobuf lib that's needed for c++ .protos that don't
 # specify the LITE_RUNTIME option. The protocol compiler itself (protoc) falls
 # into that category. Do not use in Chrome code.
 static_library("protobuf_full") {
   # Prevent people from depending on this outside our file.
   visibility = [
     ":*",
 
     # requires descriptors & reflection; testonly.
     "//third_party/libprotobuf-mutator:*",
 
     # The traffic_annotation tool is not part of Chrome itself, and needs to
     # parse human-readable protobufs.
     "//tools/traffic_annotation/*",
   ]
 
-  sources = protobuf_lite_sources + protobuf_globals_sources + [
+  sources = protobuf_lite_sources + [
     "src/google/protobuf/any.cc",
     "src/google/protobuf/any.h",
     "src/google/protobuf/any.pb.cc",
     "src/google/protobuf/any.pb.h",
     "src/google/protobuf/api.pb.cc",
     "src/google/protobuf/api.pb.h",
     "src/google/protobuf/compiler/importer.cc",
     "src/google/protobuf/compiler/importer.h",
     "src/google/protobuf/compiler/parser.cc",
     "src/google/protobuf/compiler/parser.h",
@@ skipping 449 matching lines @@
     ":copy_google_protobuf_internal",
     ":copy_six",
   ]
 
   # Targets that depend on this should depend on the copied data files.
   data = get_target_outputs(":copy_google")
   data += get_target_outputs(":copy_six")
   data += get_target_outputs(":copy_google_protobuf")
   data += get_target_outputs(":copy_google_protobuf_internal")
 }