commit afbd0f1fef46ef0ddf633dfde0de724db3da1405
author Sergei Vasilinetc <sergeyv@google.com> Mon Mar 21 21:03:40 2016 +0000
committer Sergei Vasilinetc <sergeyv@google.com> Mon Mar 21 21:03:40 2016 +0000
tree 85e008cb0315362d002817fa912bd91c05d8dd4c
parent a7f6bba1a3565c19715e878dfe7f0e01022944ff

Revert "Move text logic from jni to hwui level"

This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff.

Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd

libs/hwui/Android.mk

diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index 26b4c4e..ca07738 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -12,11 +12,6 @@
 hwui_src_files := \
     font/CacheTexture.cpp \
     font/Font.cpp \
-    hwui/Canvas.cpp \
-    hwui/MinikinSkia.cpp \
-    hwui/MinikinUtils.cpp \
-    hwui/PaintImpl.cpp \
-    hwui/TypefaceImpl.cpp \
     renderstate/Blend.cpp \
     renderstate/MeshState.cpp \
     renderstate/OffscreenBufferPool.cpp \
@@ -46,6 +41,7 @@
     AnimatorManager.cpp \
     AssetAtlas.cpp \
     Caches.cpp \
+    Canvas.cpp \
     CanvasState.cpp \
     ClipArea.cpp \
     DamageAccumulator.cpp \
@@ -147,9 +143,7 @@
 
 hwui_c_includes += \
     external/skia/include/private \
-    external/skia/src/core \
-    external/harfbuzz_ng/src \
-    external/freetype/include
+    external/skia/src/core
 
 ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT))
     hwui_cflags += -DANDROID_ENABLE_RENDERSCRIPT