Merge "Update GIFLIB to 5.1.4 DO NOT MERGE" into mnc-dev am: 279e33d754 am: 54f3d6fe60 am: 60adcd261e am: db32fc7024  -s ours am: 6eafe5439a am: 08067c7338 am: 1e275557fa am: f4bcbe6dd5
am: a090317870

Change-Id: I2232d965086f8515c45781c59560ef013d6e2cb1
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9bfb163
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,24 @@
+cc_library_static {
+    name: "libgif",
+
+    sdk_version: "9",
+
+    srcs: [
+        "dgif_lib.c",
+        "egif_lib.c",
+        "gifalloc.c",
+        "gif_err.c",
+        "gif_hash.c",
+        "openbsd-reallocarray.c",
+        "quantize.c",
+    ],
+
+    cflags: [
+        "-Wno-format",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+        "-DHAVE_CONFIG_H",
+    ],
+
+    export_include_dirs: ["."],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 437a8f7..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SDK_VERSION := 9
-
-LOCAL_SRC_FILES := \
-    dgif_lib.c     \
-    egif_lib.c     \
-    gifalloc.c     \
-    gif_err.c      \
-    gif_hash.c     \
-    openbsd-reallocarray.c     \
-    quantize.c
-
-LOCAL_CFLAGS += -Wno-format -Wno-sign-compare -Wno-unused-parameter -DHAVE_CONFIG_H
-LOCAL_MODULE:= libgif
-
-include $(BUILD_STATIC_LIBRARY)