commit c967d892456ae8d578dfc75f241d9af04f31811f
author Dimitry Ivanov <dimitry@google.com> Wed Mar 30 16:44:48 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Mon Apr 04 11:28:41 2016 -0700
tree 4e99908cc061ba4d35a783b4fe2f0bac029b0f02
parent d15837a3b20ac2151481323d6d06e8c0355d3757

Enable ifunc test for arm

Bug: http://b/27930475
Change-Id: I1f9e7c5b9ffabfd77ae6ebd534938aef39ec7987

tests/libs/Android.mk

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 506d6f2..a903732 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -346,25 +346,14 @@
 libtest_ifunc_src_files := \
     dlopen_testlib_ifunc.c
 
+# TODO(dimitry): clang does not support ifunc attribute
 libtest_ifunc_clang_host := false
+libtest_ifunc_clang_target := false
+
 module := libtest_ifunc
 build_target := SHARED_LIBRARY
 
-build_type := host
-include $(TEST_PATH)/Android.build.mk
-
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm64 x86 x86_64))
-    ifeq ($(TARGET_ARCH),arm64)
-      libtest_ifunc_multilib := 64
-      # TODO: This is a workaround - remove it once gcc
-      # removes its Android ifunc checks
-      libtest_ifunc_cflags := -mglibc
-    endif
-
-    build_type := target
-    libtest_ifunc_clang_target := false
-    include $(TEST_PATH)/Android.build.mk
-endif
+include $(LOCAL_PATH)/Android.build.testlib.mk
 
 # -----------------------------------------------------------------------------
 # Library used by atexit tests