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
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 @@
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
+minikin_src_files := \
AnalyzeStyle.cpp \
CmapCoverage.cpp \
FontCollection.cpp \
@@ -31,14 +31,12 @@
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 @@
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)
