merge from open-source master
Change-Id: I5f7a14b12ccff63b9e1813bb4a93c44654a92e4a
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk
index 1d0ecb4..ef08bec 100644
--- a/libdiskconfig/Android.mk
+++ b/libdiskconfig/Android.mk
@@ -3,17 +3,26 @@
ifneq ($(TARGET_SIMULATOR),true)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
+commonSources := \
diskconfig.c \
diskutils.c \
write_lst.c \
config_mbr.c
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(commonSources)
LOCAL_MODULE := libdiskconfig
LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
-
include $(BUILD_SHARED_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(commonSources)
+LOCAL_MODULE := libdiskconfig_host
+LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
+LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
+include $(BUILD_HOST_STATIC_LIBRARY)
+
+
+
endif # ! TARGET_SIMULATOR