From 1686c1d7a2562360bfcca52e9c53ebbcd1bed00c Mon Sep 17 00:00:00 2001 From: Victoria Lease Date: Thu, 27 Jun 2013 15:43:55 -0700 Subject: Use shared ft2 lib, deal with libpng/zlib deps Bug: 9603326 Change-Id: I7df1f68fa3a44b37b1b279387f4ddfe942928bb0 --- libs/minikin/Android.mk | 6 +++--- sample/Android.mk | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index 723ad1f..baac98c 100644 --- a/libs/minikin/Android.mk +++ b/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) diff --git a/sample/Android.mk b/sample/Android.mk index 335e7ce..939aca4 100644 --- a/sample/Android.mk +++ b/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 -- cgit v1.2.3