Merge "Don't try to compress .mkv resources" into nyc-dev

2016-04-04 14:46:09 +00:00
parent 6dffdf8285 6e452f9e8a
commit e8c5480ba6
1 changed files with 1 additions and 1 deletions
--- a/tools/aapt/Package.cpp
+++ b/tools/aapt/Package.cpp
@@ -33,7 +33,7 @@ static const char* kNoCompressExt[] = {
    ".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet",
    ".rtttl", ".imy", ".xmf", ".mp4", ".m4a",
    ".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2",
-    ".amr", ".awb", ".wma", ".wmv", ".webm"
+    ".amr", ".awb", ".wma", ".wmv", ".webm", ".mkv"
 };

 /* fwd decls, so I can write this downward */