| commit | 77e5291ca6903c9e9351c53d358a41ee181a12ce | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Jun 11 19:29:49 2014 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Wed Jun 11 19:29:49 2014 +0000 |
| tree | 33e8943c632a76dbca5b1e5b89c13a30da90df81 | |
| parent | c22fbc1093456492f47bfb8e2ae310f6d6e8cfa2 [diff] [blame] | |
| parent | 2b310e46eb28bbbe375369e47068accbdfeff3a7 [diff] [blame] |
Merge "Texture compression unit tests along with a couple of bug fixes" into master-skia https://skia.googlesource.com/skia/+/2b310e4 Change-Id: I96938abbfe517aa357439f2570081c9783e08a4e
diff --git a/dm/Android.mk b/dm/Android.mk index f2c9a58..612255d 100644 --- a/dm/Android.mk +++ b/dm/Android.mk
@@ -461,6 +461,7 @@ ../tests/TLSTest.cpp \ ../tests/TSetTest.cpp \ ../tests/TestSize.cpp \ + ../tests/TextureCompressionTest.cpp \ ../tests/TileGridTest.cpp \ ../tests/ToUnicodeTest.cpp \ ../tests/TracingTest.cpp \