Use shared ft2 lib, deal with libpng/zlib deps

Bug: 9603326 Change-Id: I7df1f68fa3a44b37b1b279387f4ddfe942928bb0
2013-06-27 15:43:55 -07:00
parent c905bdf4be
commit 79497ccc90
2 changed files with 8 additions and 5 deletions
--- a/engine/src/flutter/libs/minikin/Android.mk
+++ b/engine/src/flutter/libs/minikin/Android.mk
@@ -36,9 +36,9 @@ LOCAL_C_INCLUDES += \

 LOCAL_SHARED_LIBRARIES := \
    libharfbuzz_ng \
+    libft2 \
+    libpng \
+    libz \
    libstlport

-LOCAL_STATIC_LIBARIES := \
-    libft2
-
 include $(BUILD_STATIC_LIBRARY)
--- a/engine/src/flutter/sample/Android.mk
+++ b/engine/src/flutter/sample/Android.mk
@@ -33,9 +33,12 @@ LOCAL_SHARED_LIBRARIES += \
 	libcutils \
 	libstlport \
 	libharfbuzz_ng \
-	libicuuc
+	libicuuc \
+	libft2 \
+	libpng \
+	libz

-LOCAL_STATIC_LIBRARIES += libminikin libft2
+LOCAL_STATIC_LIBRARIES += libminikin

 LOCAL_MODULE:= minikin_example