| commit | f14e2e2d2986e93ed647adf122a1977dcf5ceadc | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Fri Apr 22 19:48:37 2016 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Fri Apr 22 19:48:37 2016 +0000 |
| tree | 10df768ce4a8c9ec8d171a78344f6ad6cdb1ad42 | |
| parent | 44fdd8eb4e981ca26ee862030b91396c9ad9d36d [diff] [blame] | |
| parent | a3b3b238f507a6ec7f43febc6bf0bb17e04e770f [diff] [blame] |
Merge "Enable flattening/unflattening with custom unflatten procs" into master-skia https://skia.googlesource.com/skia/+/a3b3b238f507a6ec7f43febc6bf0bb17e04e770f Change-Id: Ie9e7fa7e443a23ff53eabbf59984e5ae891f48d1
diff --git a/dm/Android.mk b/dm/Android.mk index 130070f..ff37117 100644 --- a/dm/Android.mk +++ b/dm/Android.mk
@@ -130,6 +130,7 @@ ../tests/ExifTest.cpp \ ../tests/FillPathTest.cpp \ ../tests/FitsInTest.cpp \ + ../tests/FlattenableCustomFactory.cpp \ ../tests/FlattenableFactoryToName.cpp \ ../tests/Float16Test.cpp \ ../tests/FloatingPointTextureTest.cpp \