diff --git a/Android.mk b/Android.mk
index e01bdcf..2d11071 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,12 +13,11 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := cp-demangle.c
-
 LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
-
 LOCAL_MODULE := libgccdemangle
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false
@@ -27,13 +26,34 @@
 
 ##########################
 
-#LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := cp-demangle.c
+LOCAL_CFLAGS += -DHAVE_STRING_H -DHAVE_STDLIB_H -DIN_GLIBCPP_V3
+LOCAL_MODULE := libgccdemangle
+LOCAL_MODULE_TAGS := optional
+LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_HOST_SHARED_LIBRARY)
+
+##########################
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := test.c
 LOCAL_SHARED_LIBRARIES := libgccdemangle
-
 LOCAL_MODULE := gccdemangle_test
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_EXECUTABLE)
+
+##########################
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := test.c
+LOCAL_SHARED_LIBRARIES := libgccdemangle
+LOCAL_MODULE := gccdemangle_test
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_EXECUTABLE)