Revert^2 "[RISCV] Disable linker relaxation for now"

This reverts commit fe8ca2cd5852d9ab88bde510b4803288a96449e2.

Reason for revert: Breaking git_main-throttled-monitored on test_suites_riscv-trunk_staging. The bug is non-deterministic so it was assumed to be fixed in local testing.

Bug: 398000890
Change-Id: Ie21209eea4f191aa20576872bd4b25ae40614b2f

1 files changed, 5 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index da429e21c2..3ea90eb91b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,11 @@ cc_defaults {
     ],
     c_std: "c99",
     cpp_std: "c++20",
+    arch: {
+        riscv64: {
+            ldflags: ["-Wl,--no-relax"],
+        },
+    },
 }
 
 // List of tidy checks that are enabled for cc targets.