diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2015-10-14 19:34:29 -0700 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2015-10-14 19:37:47 -0700 |
| commit | e8264e065f0edd58a9fa04bbdd777f2af2794789 (patch) | |
| tree | 3d3d99edf492dbe1e53446726c9dcabd11daab76 | |
| parent | e5e7aa0e8031f6f1c0ed370f70e49778f3570527 (diff) | |
| download | android_frameworks_minikin-e8264e065f0edd58a9fa04bbdd777f2af2794789.tar.gz android_frameworks_minikin-e8264e065f0edd58a9fa04bbdd777f2af2794789.tar.bz2 android_frameworks_minikin-e8264e065f0edd58a9fa04bbdd777f2af2794789.zip | |
Complete half-done cherry-picking of Android.mk. DO NOT MERGE
The previous commit, 6e2cccdc518f8d3424c84ae6fbe0e87ae3c3f66a, was
incompletely cherry-picked. This adds the missing parts.
Bug: 24570591
Change-Id: I1097c60587fb8a88cfe6b8ffed5b1689d9bdd429
| -rw-r--r-- | libs/minikin/Android.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index 7558f83..c3e70db 100644 --- a/libs/minikin/Android.mk +++ b/libs/minikin/Android.mk @@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ +minikin_src_files := \ AnalyzeStyle.cpp \ CmapCoverage.cpp \ FontCollection.cpp \ @@ -31,14 +31,12 @@ LOCAL_SRC_FILES := \ MinikinFontFreeType.cpp \ SparseBitSet.cpp -LOCAL_MODULE := libminikin - -LOCAL_C_INCLUDES += \ +minikin_c_includes += \ external/harfbuzz_ng/src \ external/freetype/include \ frameworks/minikin/include -LOCAL_SHARED_LIBRARIES := \ +minikin_shared_libraries := \ libharfbuzz_ng \ libft2 \ liblog \ @@ -47,6 +45,12 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libutils +LOCAL_MODULE := libminikin +LOCAL_EXPORT_C_INCLUDE_DIRS := frameworks/minikin/include +LOCAL_SRC_FILES := $(minikin_src_files) +LOCAL_C_INCLUDES := $(minikin_c_includes) +LOCAL_SHARED_LIBRARIES := $(minikin_shared_libraries) + include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) |