From c01121c52279a02f503bec3275ffb61fd837b555 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 25 Aug 2016 14:11:07 -0700 Subject: Convert to Android.bp See build/soong/README.md for more information. Change-Id: I816234e730f645c8574ab58d1c2be92c51c3968a --- Android.bp | 30 ++++++++++++++++++++++++++++++ Android.mk | 24 ------------------------ 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk 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, + }, + }, +} 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) -- cgit v1.2.3