Merge "Cleanup DM makefile to no longer depend on HWUI."
diff --git a/dm/Android.mk b/dm/Android.mk
index db73d6f..356bd2c 100644
--- a/dm/Android.mk
+++ b/dm/Android.mk
@@ -326,7 +326,6 @@
../tests/YUVTest.cpp \
../tests/image-bitmap.cpp \
../tests/skbug5221.cpp \
- DMSrcSinkAndroid.cpp \
../gm/OverStroke.cpp \
../gm/SkLinearBitmapPipelineGM.cpp \
../gm/aaa.cpp \
@@ -694,7 +693,6 @@
LOCAL_STATIC_LIBRARIES := \
libskia \
- libhwui_static \
libjsoncpp
LOCAL_C_INCLUDES := \
@@ -765,7 +763,6 @@
# i.e. external/skia/DATA/skia_resources --> ../resources
LOCAL_PICKUP_FILES := $(LOCAL_PATH)/../DATA
include $(LOCAL_PATH)/../skia_static_deps.mk
-include frameworks/base/libs/hwui/hwui_static_deps.mk
include $(BUILD_NATIVE_TEST)
endif
\ No newline at end of file