diff options
author | Victoria Lease <violets@google.com> | 2013-06-27 11:30:31 -0700 |
---|---|---|
committer | Victoria Lease <violets@google.com> | 2013-06-27 14:11:54 -0700 |
commit | 899c67b6cfcd2010784fbf08c5415af16c526e0c (patch) | |
tree | c75d7dc57e133b09dc56c1e6e58f74b2f86238ba | |
parent | af9efeb7136036f6a7601af583868a0c606d5754 (diff) | |
download | freetype-kitkat-cts-dev.tar.gz |
Enable FT_CONFIG_OPTION_USE_PNG, build shared libandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-l-preview_r2android-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_r1l-previewkitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devidea133-weekly-releaseidea133
Due to FT_CONFIG_OPTION_USE_PNG, FreeType now depends upon libpng and
zlib. While I'm adding those dependencies, I might as well also make
libft2 a shared library...
Bug: 9603326
Bug: 9577689
Change-Id: Ibeeaeef72d39df07535424b49810675d652b8fc8
-rw-r--r-- | Android.mk | 8 | ||||
-rw-r--r-- | include/freetype/config/ftoption.h | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 51ae31bb7..e35739710 100644 --- a/Android.mk +++ b/Android.mk @@ -37,13 +37,17 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/builds \ - $(LOCAL_PATH)/include + $(LOCAL_PATH)/include \ + external/libpng \ + external/zlib LOCAL_CFLAGS += -W -Wall LOCAL_CFLAGS += -fPIC -DPIC LOCAL_CFLAGS += "-DDARWIN_NO_CARBON" LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY" +LOCAL_SHARED_LIBRARIES += libpng libz + # the following is for testing only, and should not be used in final builds # of the product #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER" @@ -52,5 +56,5 @@ LOCAL_CFLAGS += -O2 LOCAL_MODULE:= libft2 -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) endif diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 44e4fb076..bc239bf01 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -225,7 +225,7 @@ FT_BEGIN_HEADER /* */ /* Define this macro if you want to enable this `feature'. */ /* */ -/* #define FT_CONFIG_OPTION_USE_PNG */ +#define FT_CONFIG_OPTION_USE_PNG /*************************************************************************/ |