commit 858f2d28ac741ef139f74bdbdbcefa7560f17c91
author Victoria Lease <violets@google.com> Thu Jun 27 11:29:31 2013 -0700
committer Victoria Lease <violets@google.com> Thu Jun 27 11:29:31 2013 -0700
tree 25c3e55ddfe48e30e599dc4e6d28fb684387e43e
parent 6ead70f31aad854e90efaa34547ccf10f8660143

Use shared libft2 with new libpng/zlib deps.

FreeType now depends upon libpng and zlib. While I'm adding those
dependencies, I might as well also switch libft2 to a shared
library...

Bug: 9603326
Change-Id: Ibe45c186f0c933fbecebbeffc2d990b4e99d913f

Android.mk

diff --git a/Android.mk b/Android.mk
index f11a6ba..969c53d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,13 +53,13 @@
 
 LOCAL_SHARED_LIBRARIES := \
         libcutils \
+        libft2 \
         libicuuc \
         libicui18n \
+        libpng \
         libutils \
-        liblog
-
-LOCAL_STATIC_LIBRARIES := \
-        libft2
+        liblog \
+        libz
 
 LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/src \