Commit 0a6967d4 authored by Brian Sheedy's avatar Brian Sheedy Committed by Commit Bot

Revert "android: build: Enable RELR packed relocations for libchrome.so"

This reverts commit d481ab54.

Reason for revert: Cause of https://crbug.com/900049

Original change's description:
> android: build: Enable RELR packed relocations for libchrome.so
> 
> This saves about 100 kiB on 32-bit ARM libchrome.so.
> 
> This optimization cannot be applied to libmonochrome.so, unfortunately,
> because only Android P and above support these at the system linker
> level.
> 
> BUG=895194
> R=​agrieve@chromium.org,torne@chromium.org,pasko@chromium.org,pcc@chromium.org
> 
> Change-Id: I5c554dc3dbc1b3ea27edb60579a5cc0dcdc7d759
> Reviewed-on: https://chromium-review.googlesource.com/c/1304487
> Commit-Queue: David Turner <digit@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#603532}

TBR=pasko@chromium.org,digit@chromium.org,torne@chromium.org,pcc@chromium.org,agrieve@chromium.org

Change-Id: Idc7f5a39c0be7a7b7d2221a1635add4d2d5b292a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 895194
Reviewed-on: https://chromium-review.googlesource.com/c/1307077Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603719}
parent 977ee4cc
...@@ -203,12 +203,6 @@ config("lld_pack_relocations") { ...@@ -203,12 +203,6 @@ config("lld_pack_relocations") {
ldflags = [ "-Wl,--pack-dyn-relocs=android" ] ldflags = [ "-Wl,--pack-dyn-relocs=android" ]
} }
# Pack relocations with Android-specific relocations and RELR relocations that
# are only supported by the crazy linker and Android P+.
config("lld_pack_relocations_with_relr") {
ldflags = [ "-Wl,--pack-dyn-relocs=android+relr,--use-android-relr-tags" ]
}
# Used for instrumented build to generate the orderfile. # Used for instrumented build to generate the orderfile.
config("default_orderfile_instrumentation") { config("default_orderfile_instrumentation") {
if (use_order_profiling) { if (use_order_profiling) {
......
...@@ -1010,7 +1010,7 @@ template("chrome_shared_library") { ...@@ -1010,7 +1010,7 @@ template("chrome_shared_library") {
} }
if (chromium_linker_supported && use_lld) { if (chromium_linker_supported && use_lld) {
configs += [ "//build/config/android:lld_pack_relocations_with_relr" ] configs += [ "//build/config/android:lld_pack_relocations" ]
} }
if (chromium_linker_supported && target_cpu != "mipsel" && if (chromium_linker_supported && target_cpu != "mipsel" &&
target_cpu != "mipsel64") { target_cpu != "mipsel64") {
...@@ -1273,7 +1273,7 @@ shared_library("chrome_sync_shell") { ...@@ -1273,7 +1273,7 @@ shared_library("chrome_sync_shell") {
"//components/sync:test_support_fake_server_android", "//components/sync:test_support_fake_server_android",
] ]
if (chromium_linker_supported && use_lld) { if (chromium_linker_supported && use_lld) {
configs += [ "//build/config/android:lld_pack_relocations_with_relr" ] configs += [ "//build/config/android:lld_pack_relocations" ]
} }
if (enable_vr) { if (enable_vr) {
sources += [ "../browser/android/vr/register_jni.cc" ] sources += [ "../browser/android/vr/register_jni.cc" ]
......
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