commit b36f966df9e7767a6b0aeb00fea29af0c57c89be
author Dan Willemsen <dwillemsen@google.com> Wed Sep 14 02:22:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 14 02:22:48 2016 +0000
tree aead29b49ed15d1fea3f61c84e6aa7a3a0d65da7
parent b9fab8a946d131581d1a7589ddd956d77612363b
parent f6678157654063ec569a9ad29c2628b8aaa0c1e6

Convert to Android.bp am: c01121c522 am: 61bae021b5
am: f667815765

Change-Id: Icf2771a158554135ed998bd9759d39922e8ea7e9

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..a6e232d
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,30 @@
+cc_library {
+    name: "libzopfli",
+    host_supported: true,
+
+    cflags: [
+        "-O2",
+        "-Wno-unused-parameter",
+        "-Werror",
+    ],
+    srcs: [
+        "src/zopfli/blocksplitter.c",
+        "src/zopfli/cache.c",
+        "src/zopfli/deflate.c",
+        "src/zopfli/gzip_container.c",
+        "src/zopfli/hash.c",
+        "src/zopfli/katajainen.c",
+        "src/zopfli/lz77.c",
+        "src/zopfli/squeeze.c",
+        "src/zopfli/tree.c",
+        "src/zopfli/util.c",
+        "src/zopfli/zlib_container.c",
+        "src/zopfli/zopfli_lib.c",
+    ],
+
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
+}

Android.mk

diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 9e466e0..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-zopfli_files := \
-	src/zopfli/blocksplitter.c src/zopfli/cache.c\
-    src/zopfli/deflate.c src/zopfli/gzip_container.c\
-    src/zopfli/hash.c src/zopfli/katajainen.c\
-    src/zopfli/lz77.c src/zopfli/squeeze.c\
-    src/zopfli/tree.c src/zopfli/util.c\
-    src/zopfli/zlib_container.c src/zopfli/zopfli_lib.c
-
-LOCAL_MODULE := libzopfli
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_CFLAGS += -O2 -Wno-unused-parameter -Werror
-LOCAL_SRC_FILES := $(zopfli_files)
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libzopfli
-LOCAL_CFLAGS += -O2 -Wno-unused-parameter -Werror
-LOCAL_SRC_FILES := $(zopfli_files)
-LOCAL_MULTILIB := both
-include $(BUILD_SHARED_LIBRARY)