commit 3bed41cf3ace3105686f626fed2ac802376852f3
author Dan Albert <danalbert@google.com> Thu Aug 07 17:39:34 2014 -0700
committer Dan Albert <danalbert@google.com> Thu Aug 07 17:40:21 2014 -0700
tree b8cfa78933aa74c37e032a07b50f7e206218d9ce
parent d842648ee0ae8df1a899c53e96a98ccc6cca9d4c

Workaround for test failures after Bsymbolic fix.

Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 09ec004..0b13a3f 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -377,7 +377,9 @@
   LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN)
 
   LOCAL_CFLAGS := $$(LIBART_CFLAGS)
-  LOCAL_LDFLAGS := $$(LIBART_LDFLAGS)
+  # TODO(danalbert): Work around the test failures caused by removing -Bsymbolic
+  # by turning it back on for libart until I get a chance to look at them.
+  LOCAL_LDFLAGS := $$(LIBART_LDFLAGS) -Wl,-Bsymbolic
   ifeq ($$(art_target_or_host),target)
     LOCAL_LDFLAGS += $$(LIBART_TARGET_LDFLAGS)
   else