Merge "Add HWUI Sink to DM on Android Framework builds" into master-skia
https://skia.googlesource.com/skia/+/eebc39ad5a1dcbde1b10a9b2ab54679549522b52
Change-Id: I46945a3498e522ccde623a0041b36c3b167e9951
diff --git a/dm/Android.mk b/dm/Android.mk
index 9bd4f55..fb8893d 100644
--- a/dm/Android.mk
+++ b/dm/Android.mk
@@ -251,6 +251,7 @@
../tests/YUVCacheTest.cpp \
../tests/PipeTest.cpp \
../tests/TDStackNesterTest.cpp \
+ DMSrcSinkAndroid.cpp \
../gm/aaclip.cpp \
../gm/aarectmodes.cpp \
../gm/addarc.cpp \
@@ -476,6 +477,10 @@
LOCAL_SHARED_LIBRARIES := \
liblog \
libskia \
+ libandroid \
+ libgui \
+ libhwui \
+ libutils \
libdl \
libGLESv2 \
libEGL \
@@ -516,6 +521,8 @@
$(LOCAL_PATH)/../src/pdf \
$(LOCAL_PATH)/../experimental/PdfViewer \
$(LOCAL_PATH)/../experimental/PdfViewer/src \
+ $(LOCAL_PATH)/../../../frameworks/base/libs/hwui \
+ $(LOCAL_PATH)/../../../frameworks/native/include \
$(LOCAL_PATH)/../src/ports \
$(LOCAL_PATH)/../third_party/etc1 \
$(LOCAL_PATH)/../tools/timer \