From 31951b7f0dc7ce577a21682e54362b0cf2913e11 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 11 Dec 2015 16:38:06 -0800
Subject: [PATCH] Don't verify version scripts on 32-bit Brillo

Brillo doesn't use the ndk cruft, so the same version scripts do not
apply. Until we have brillo-specific version scripts, just disable the
version script check.

Bug: 26164862
Change-Id: I682860ec1c5b36014c7a6cf24da43df553e9dc9f
---
 libc/Android.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libc/Android.mk b/libc/Android.mk
index 456527a11..2c29f2409 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1424,6 +1424,14 @@ LOCAL_LDFLAGS_mips64 += -Wl,--version-script,$(LOCAL_PATH)/libc.mips64.map
 LOCAL_LDFLAGS_x86    += -Wl,--version-script,$(LOCAL_PATH)/libc.x86.map
 LOCAL_LDFLAGS_x86_64 += -Wl,--version-script,$(LOCAL_PATH)/libc.x86_64.map
 
+# Brillo doesn't use the same libc 32-bit ABI as Android (no ndk cruft)
+ifdef BRILLO
+# TODO: b/26164862 provide alternate version scripts instead of disabling verification.
+LOCAL_LDFLAGS_arm += -Wl,--undefined-version
+LOCAL_LDFLAGS_mips += -Wl,--undefined-version
+LOCAL_LDFLAGS_x86 += -Wl,--undefined-version
+endif
+
 # We'd really like to do this for all architectures, but since this wasn't done
 # before, these symbols must continue to be exported on LP32 for binary
 # compatibility.