| Index: third_party/protobuf/BUILD.gn
|
| diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn
|
| index 31dca3de1fb827ca31c79e86504ae8e013713ffc..48a8f2395d140118f7eeac2bd33d6234a079b871 100644
|
| --- a/third_party/protobuf/BUILD.gn
|
| +++ b/third_party/protobuf/BUILD.gn
|
| @@ -136,18 +136,7 @@
|
| ]
|
| }
|
|
|
| -# 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"
|
| -}
|
| -target(link_target_type, "protobuf_lite") {
|
| +component("protobuf_lite") {
|
| sources = protobuf_lite_sources
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| @@ -177,7 +166,7 @@
|
| cflags = protobuf_lite_cflags
|
|
|
| # Required for component builds. See http://crbug.com/172800.
|
| - if (is_component_build && (!is_linux || is_chromeos)) {
|
| + if (is_component_build) {
|
| public_configs += [ ":protobuf_use_dlls" ]
|
| defines = [ "LIBPROTOBUF_EXPORTS" ]
|
| }
|
|
|