diff options
| author | Victoria Lease <violets@google.com> | 2013-06-27 15:43:55 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-06-27 15:43:55 -0700 |
| commit | 1686c1d7a2562360bfcca52e9c53ebbcd1bed00c (patch) | |
| tree | 7d9df9761aff7585b698f13b3b9854e5fd585f20 | |
| parent | f660ef9ee63a500b7fb878e502ea5fd519c39607 (diff) | |
| download | android_frameworks_minikin-1686c1d7a2562360bfcca52e9c53ebbcd1bed00c.tar.gz android_frameworks_minikin-1686c1d7a2562360bfcca52e9c53ebbcd1bed00c.tar.bz2 android_frameworks_minikin-1686c1d7a2562360bfcca52e9c53ebbcd1bed00c.zip | |
Use shared ft2 lib, deal with libpng/zlib deps
Bug: 9603326
Change-Id: I7df1f68fa3a44b37b1b279387f4ddfe942928bb0
| -rw-r--r-- | libs/minikin/Android.mk | 6 | ||||
| -rw-r--r-- | 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 |