From f79c88c1906b14b59e19603fec93dba67844f3b4 Mon Sep 17 00:00:00 2001
From: Sergey Perepelitsa <non_2001@mail.ru>
Date: Thu, 12 Feb 2015 23:34:40 +0300
Subject: [PATCH 1/2] Android.mk

---
 Android.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 000000000000..c0ddd7885cc7
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cppformat_static
+LOCAL_MODULE_FILENAME := libcppformat
+
+LOCAL_SRC_FILES := format.cc
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_CFLAGS += -std=c++11 -fexceptions
+
+include $(BUILD_STATIC_LIBRARY)
+
+$(call import-module,.)

From 1d49443405fc1f100df79a3302cad19d6f752699 Mon Sep 17 00:00:00 2001
From: Sergey <non_2001@mail.ru>
Date: Sun, 15 Feb 2015 19:21:32 +0300
Subject: [PATCH 2/2] fix android.mk

---
 Android.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index c0ddd7885cc7..db56d98db26b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,4 +13,3 @@ LOCAL_CFLAGS += -std=c++11 -fexceptions
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,.)