From 9df4b13baff9f958ad39a8cff59924c157978dac Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Fri, 14 Nov 2014 12:17:06 -0800
Subject: [PATCH] Fix host build for arm/arm64

Change-Id: Id92543e4080aede205b3e63099fa2baa36ba21f0
---
 tests/libs/Android.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index 777ae4ba5..fafb9e0b3 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -324,12 +324,17 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
 # -----------------------------------------------------------------------------
 # Library with DF_1_GLOBAL
 # -----------------------------------------------------------------------------
-# TODO: re-enable arm once b/18137520 or b/18130452 are fixed
-ifeq ($(filter $(TARGET_ARCH),arm arm64),)
 libdl_test_df_1_global_src_files := dl_df_1_global.cpp
 libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global
 module := libdl_test_df_1_global
+# TODO: re-enable arm once b/18137520 or b/18130452 are fixed
+ifeq ($(filter $(TARGET_ARCH),arm arm64),)
 include $(LOCAL_PATH)/Android.build.testlib.mk
+else
+# build it for host only
+build_target := SHARED_LIBRARY
+build_type := host
+include $(TEST_PATH)/Android.build.mk
 endif
 
 # -----------------------------------------------------------------------------