Workaround for test failures after Bsymbolic fix.
Bug: 16853291
Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96
(cherry picked from commit 3bed41cf3ace3105686f626fed2ac802376852f3)
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 302e835..ac0b414 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -375,7 +375,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