diff options
| author | Raph Levien <raph@google.com> | 2013-07-15 14:19:59 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-05-12 09:08:15 -0700 |
| commit | ecc2d34ac23a497988f21e5f415b53c007b9d8c5 (patch) | |
| tree | 876b3c943b7841c9600db636738cd0e59b5f2a7c /sample/Android.mk | |
| parent | 5adafc0d84d238948b5d257ec5311030ca04271c (diff) | |
| download | android_frameworks_minikin-ecc2d34ac23a497988f21e5f415b53c007b9d8c5.tar.gz android_frameworks_minikin-ecc2d34ac23a497988f21e5f415b53c007b9d8c5.tar.bz2 android_frameworks_minikin-ecc2d34ac23a497988f21e5f415b53c007b9d8c5.zip | |
A basket of features: itemization, bounds, refcount
This patch improves script run itemization and also exposes metrics
and bounds for layouts. In addition, there is a fair amount of internal
cleanup, including ref counting, and making the MinikinFont abstraction
strong enough to support both FreeType and Skia implementations. There
is also a sample implementation using Skia, in the sample directory.
As part of its functionality, his patch measures the bounds of the
layout and gives access through Layout::GetBounds(). The corresponding
method is not implemented in the FreeType-only implementation of
MinikinFont, so that will probably have to be fixed.
Change-Id: Ib1a3fe9d7c90519ac651fb4aa957848e4bb758ec
Diffstat (limited to 'sample/Android.mk')
| -rw-r--r-- | sample/Android.mk | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/sample/Android.mk b/sample/Android.mk index 939aca4..a19019a 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -36,10 +36,40 @@ LOCAL_SHARED_LIBRARIES += \ libicuuc \ libft2 \ libpng \ - libz - -LOCAL_STATIC_LIBRARIES += libminikin + libz \ + libminikin LOCAL_MODULE:= minikin_example include $(BUILD_EXECUTABLE) + + +include $(CLEAR_VARS) +include external/stlport/libstlport.mk + +LOCAL_MODULE_TAG := tests + +LOCAL_C_INCLUDES += \ + external/harfbuzz_ng/src \ + external/freetype/include \ + external/icu4c/common \ + frameworks/minikin/include \ + external/skia/src/core + +LOCAL_SRC_FILES:= example_skia.cpp \ + MinikinSkia.cpp + +LOCAL_SHARED_LIBRARIES += \ + libutils \ + liblog \ + libcutils \ + libstlport \ + libharfbuzz_ng \ + libicuuc \ + libskia \ + libminikin \ + libft2 + +LOCAL_MODULE:= minikin_skia_example + +include $(BUILD_EXECUTABLE) |