Merge in upstream master after initial import
Also replaces the NDK Android.mk with an Android.bp for platform use.
Test: mm
Change-Id: I5784586573e3a0a67d728f7fc2441354dcece3b2
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..e8f4b3a
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,13 @@
+cc_library {
+ name: "fmtlib",
+ srcs: ["fmt/format.cc"],
+ cflags: [
+ "-std=c++11",
+ "-fno-exceptions",
+ ],
+ sanitize: {
+ misc_undefined: ["integer"],
+ },
+ local_include_dirs: ["."],
+ export_include_dirs: ["."],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5d86239..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := fmt_static
-LOCAL_MODULE_FILENAME := libfmt
-
-LOCAL_SRC_FILES := fmt/format.cc
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-
-LOCAL_CFLAGS += -std=c++11 -fexceptions
-
-include $(BUILD_STATIC_LIBRARY)
-
