Build static library for unbundled apps, and build with prebuilt NDK.
Change-Id: I0e9fc3d9cf1110360af210d3237473e0a829873d
diff --git a/Android.mk b/Android.mk
index bcba01c..d813941 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,8 +42,31 @@
# For the device
# =====================================================
+# Device static library
include $(CLEAR_VARS)
+ifneq ($(TARGET_ARCH),x86)
+LOCAL_NDK_VERSION := 4
+LOCAL_SDK_VERSION := 8
+endif
+
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+LOCAL_CFLAGS += $(common_CFLAGS)
+LOCAL_C_INCLUDES += $(common_C_INCLUDES)
+
+LOCAL_MODULE:= libexpat_static
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)
+
+# Device shared library
+include $(CLEAR_VARS)
+
+ifneq ($(TARGET_ARCH),x86)
+LOCAL_NDK_VERSION := 4
+LOCAL_SDK_VERSION := 8
+endif
+
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
