Merge "***Disables swizzles to 565. We may want to enable swizzles to 565 for images that are encoded in a format similar to 565, however, we do not want to take images that decode naturally to kN32 and then convert them to 565." into master-skia
https://skia.googlesource.com/skia/+/438b2adefb9e9213e0ddaf0609405d3087a1cf0a
Change-Id: I589cedf3ca05e5dea28865f130230040519b0f72
diff --git a/dm/Android.mk b/dm/Android.mk
index a4d3160..91911c4 100644
--- a/dm/Android.mk
+++ b/dm/Android.mk
@@ -236,6 +236,7 @@
../tests/StrokerTest.cpp \
../tests/SurfaceTest.cpp \
../tests/SVGDeviceTest.cpp \
+ ../tests/SwizzlerTest.cpp \
../tests/TessellatingPathRendererTests.cpp \
../tests/TArrayTest.cpp \
../tests/TemplatesTest.cpp \
@@ -534,6 +535,7 @@
$(LOCAL_PATH)/../src/utils/debugger \
$(LOCAL_PATH)/../tests \
$(LOCAL_PATH)/../src/pathops \
+ $(LOCAL_PATH)/../src/codec \
$(LOCAL_PATH)/../src/image \
$(LOCAL_PATH)/../src/pdf \
$(LOCAL_PATH)/../experimental/PdfViewer \