commit 8334f50d031a7a158b9492311af30efc75da23dc
author Colin Cross <ccross@android.com> Fri Dec 02 16:39:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 02 16:39:32 2016 +0000
tree 0e14ba0232d7d9ccde7879976c1c3f4fffd1ed24
parent a57aff106d30e39c782e681f8e4aa3aa612f81c3
parent 5c5cf63f78ee4787ad5619ee111097502851e12d

Merge "Convert giflib to Android.bp" am: c549daef5e am: 34bd52e5be am: c473b4eb0b
am: 5c5cf63f78

Change-Id: I5182d006d5e75d91379ce919566fd63495a8941a

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..00bbf93
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,21 @@
+cc_library_static {
+    name: "libgif",
+
+    sdk_version: "9",
+
+    srcs: [
+        "dgif_lib.c",
+        "egif_lib.c",
+        "gifalloc.c",
+        "gif_err.c",
+        "gif_hash.c",
+        "quantize.c",
+    ],
+
+    cflags: [
+        "-Wno-format",
+        "-Wno-sign-compare",
+        "-Wno-unused-parameter",
+        "-DHAVE_CONFIG_H",
+    ],
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 03a9355..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,17 +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     \
-    quantize.c
-
-LOCAL_CFLAGS += -Wno-format -Wno-sign-compare -Wno-unused-parameter -DHAVE_CONFIG_H
-LOCAL_MODULE:= libgif
-
-include $(BUILD_STATIC_LIBRARY)