| commit | 1a4cd5351e21e326211dbf48b98ce491d996d37b | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Sep 03 22:39:52 2014 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Sep 03 22:39:52 2014 +0000 |
| tree | 30a5d270bf8f594508da0177a0ee1ec14b5710e4 | |
| parent | 5e0ba8ac7434674750ba1fc674101831e241f371 [diff] [blame] | |
| parent | 406654be7a930b484159f5bca107d3b11d8a9ede [diff] [blame] |
Merge "SkThreadPool ~~> SkTaskGroup" into master-skia https://skia.googlesource.com/skia/+/406654b Change-Id: Ibfbf2c6879167f9664109e2f8d252d5986a6c2cf
diff --git a/dm/Android.mk b/dm/Android.mk index 7f834be..9e2847e 100644 --- a/dm/Android.mk +++ b/dm/Android.mk
@@ -36,6 +36,7 @@ DMWriteTask.cpp \ ../gm/gm.cpp \ ../gm/gm_expectations.cpp \ + ../src/utils/SkTaskGroup.cpp \ ../src/pipe/utils/SamplePipeControllers.cpp \ ../src/utils/debugger/SkDebugCanvas.cpp \ ../src/utils/debugger/SkDrawCommand.cpp \