diff options
author | Victoria Lease <violets@google.com> | 2013-06-27 11:29:31 -0700 |
---|---|---|
committer | Victoria Lease <violets@google.com> | 2013-06-27 11:29:31 -0700 |
commit | 858f2d28ac741ef139f74bdbdbcefa7560f17c91 (patch) | |
tree | 25c3e55ddfe48e30e599dc4e6d28fb684387e43e | |
parent | 6ead70f31aad854e90efaa34547ccf10f8660143 (diff) | |
download | harfbuzz-858f2d28ac741ef139f74bdbdbcefa7560f17c91.tar.gz |
Use shared libft2 with new libpng/zlib deps.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133-weekly-releaseidea133
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
-rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -53,13 +53,13 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libcutils \ + libft2 \ libicuuc \ libicui18n \ + libpng \ libutils \ - liblog - -LOCAL_STATIC_LIBRARIES := \ - libft2 + liblog \ + libz LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/src \ |