commit 7046f391d1162cdb841050407a58118e186a20b0
author Ryan Prichard <rprichard@google.com> Thu May 24 14:07:27 2018 -0700
committer Ryan Prichard <rprichard@google.com> Thu May 24 20:14:56 2018 -0700
tree 1919f230f6fd33d378a732f2084e2b4d5fd33420
parent ebf58a6cefa7692702e3bd7abc88e09849391662

Reenable __work_around_b_24465209__ for x86 linker

Bug: b/80258696
Test: build aosp_x86-userdebug ; run emulator
Change-Id: If7de24c3fc91a143c0bd17c6364c56ec04dfb08e
(cherry picked from commit dac8340c437c9dafcc7e621f9dafa6a2239c3ca9)

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index 9e18954..78d425e 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -105,6 +105,7 @@
         },
         x86: {
             srcs: ["arch/x86/begin.S"],
+            cflags: ["-D__work_around_b_24465209__"],
             version_script: "linker.generic.map",
         },
         x86_64: {