From 73d8fca01e8166ab64558813d904a870ab8ab2e0 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 17 Jun 2014 23:30:20 -0700
Subject: [PATCH 1/3] Android.mk: add ENABLE_SHARED flag

builds libwebp.so instead of libwebp.a
$ ndk-build ENABLE_SHARED=1

Change-Id: Ide05e3be4f9848852e6d7e9d99abe11344419241
---
 Android.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index b63e412e..469057f0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,7 +93,11 @@ LOCAL_STATIC_LIBRARIES := cpufeatures
 
 LOCAL_MODULE := webp
 
-include $(BUILD_STATIC_LIBRARY)
+ifeq ($(ENABLE_SHARED),1)
+  include $(BUILD_SHARED_LIBRARY)
+else
+  include $(BUILD_STATIC_LIBRARY)
+endif
 
 include $(CLEAR_VARS)
 

From ca0fa7c7a57c2098384c4b41613a68972157a295 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 17 Jun 2014 23:33:10 -0700
Subject: [PATCH 2/3] Android.mk: move dwebp to examples/Android.mk

this depends on the top-level Android.mk for shared flags

Change-Id: Id418eb9639e839518a921ffcb6a376ce10aafbd2
---
 Android.mk          | 14 +-------------
 examples/Android.mk | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 examples/Android.mk

diff --git a/Android.mk b/Android.mk
index 469057f0..426bc449 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,18 +99,6 @@ else
   include $(BUILD_STATIC_LIBRARY)
 endif
 
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    examples/dwebp.c \
-    examples/example_util.c \
-
-LOCAL_CFLAGS := $(WEBP_CFLAGS)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
-LOCAL_STATIC_LIBRARIES := webp
-
-LOCAL_MODULE := dwebp
-
-include $(BUILD_EXECUTABLE)
+include $(LOCAL_PATH)/examples/Android.mk
 
 $(call import-module,android/cpufeatures)
diff --git a/examples/Android.mk b/examples/Android.mk
new file mode 100644
index 00000000..fa8a9a6b
--- /dev/null
+++ b/examples/Android.mk
@@ -0,0 +1,26 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    example_util.c \
+
+LOCAL_CFLAGS := $(WEBP_CFLAGS)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src
+
+LOCAL_MODULE := example_util
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    dwebp.c \
+
+LOCAL_CFLAGS := $(WEBP_CFLAGS)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src
+LOCAL_STATIC_LIBRARIES := example_util webp
+
+LOCAL_MODULE := dwebp
+
+include $(BUILD_EXECUTABLE)

From d51467841e687b775f982622e858bd2abe192496 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Tue, 17 Jun 2014 23:37:00 -0700
Subject: [PATCH 3/3] examples/Android.mk: add cwebp

Change-Id: Id8edd3c17d82e4ab0087c315cd3ead1cb285e714
---
 examples/Android.mk | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/examples/Android.mk b/examples/Android.mk
index fa8a9a6b..fcc92268 100644
--- a/examples/Android.mk
+++ b/examples/Android.mk
@@ -14,6 +14,26 @@ include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
+# Note: to enable jpeg/png encoding the sources from AOSP can be used with
+# minor modification to their Android.mk files.
+LOCAL_SRC_FILES := \
+    cwebp.c \
+    jpegdec.c \
+    metadata.c \
+    pngdec.c \
+    tiffdec.c \
+    webpdec.c \
+
+LOCAL_CFLAGS := $(WEBP_CFLAGS)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../src
+LOCAL_STATIC_LIBRARIES := example_util webp
+
+LOCAL_MODULE := cwebp
+
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := \
     dwebp.c \