Commit 0c41037a authored by Friedrich Horschig [CET]'s avatar Friedrich Horschig [CET] Committed by Commit Bot

Revert "Add RPATH to shared libraries"

This reverts commit 3b3db143.

Reason for revert: Strongest suspect for the last 40 failures of telemetry_perf_unittests and telemetry_unittests which failed being unable to find some shared libraries.

Bug:913070

Original change's description:
> Add RPATH to shared libraries
> 
> Fixes libfontconfig.so not being able to find libfreetype_harfbuzz.so:
> 
> $ ldd libfontconfig.so | grep freetype_harfbuzz
> 	libfreetype_harfbuzz.so => not found
> $ ls libfreetype_harfbuzz.so
> libfreetype_harfbuzz.so
> 
> R=​thakis
> 
> Bug: 911836,912366
> Change-Id: Ia0aaed8fc2c745b02cecf9ee3ce9888c1d8ccf77
> Reviewed-on: https://chromium-review.googlesource.com/c/1362457
> Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#614255}

TBR=thakis@chromium.org,dpranke@chromium.org,thomasanderson@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 911836, 912366
Change-Id: Ief4c7258208a2903bb06685d4edc76f482f7a0bf
Reviewed-on: https://chromium-review.googlesource.com/c/1371385Reviewed-by: default avatarFriedrich Horschig [CET] <fhorschig@chromium.org>
Commit-Queue: Friedrich Horschig [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615492}
parent 8e3fd554
...@@ -385,8 +385,6 @@ config("shared_library_config") { ...@@ -385,8 +385,6 @@ config("shared_library_config") {
configs += [ "//build/config/ios:ios_dynamic_flags" ] configs += [ "//build/config/ios:ios_dynamic_flags" ]
} else if (is_chromecast) { } else if (is_chromecast) {
configs += [ "//build/config/chromecast:shared_library_config" ] configs += [ "//build/config/chromecast:shared_library_config" ]
} else if (is_linux || current_os == "aix") {
configs += [ "//build/config/gcc:shared_library_config" ]
} }
# If we're using the prebuilt instrumented libraries with the sanitizers, we # If we're using the prebuilt instrumented libraries with the sanitizers, we
......
...@@ -84,24 +84,20 @@ config("rpath_for_built_shared_libraries") { ...@@ -84,24 +84,20 @@ config("rpath_for_built_shared_libraries") {
} }
} }
if (is_component_build && !is_android) {
# See the rpath_for... config above for why this is necessary for component
# builds.
executable_and_shared_library_configs_ =
[ ":rpath_for_built_shared_libraries" ]
} else {
executable_and_shared_library_configs_ = []
}
# Settings for executables. # Settings for executables.
config("executable_config") { config("executable_config") {
configs = executable_and_shared_library_configs_
ldflags = [ "-pie" ] ldflags = [ "-pie" ]
if (is_android) { if (is_android) {
ldflags += [ ldflags += [
"-Bdynamic", "-Bdynamic",
"-Wl,-z,nocopyreloc", "-Wl,-z,nocopyreloc",
] ]
} else {
# See the rpath_for... config above for why this is necessary for component
# builds.
if (is_component_build) {
configs = [ ":rpath_for_built_shared_libraries" ]
}
} }
if (!is_android && current_os != "aix") { if (!is_android && current_os != "aix") {
...@@ -120,8 +116,3 @@ config("executable_config") { ...@@ -120,8 +116,3 @@ config("executable_config") {
] ]
} }
} }
# Settings for shared libraries.
config("shared_library_config") {
configs = executable_and_shared_library_configs_
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment