diff options
| author | 2016-04-04 14:46:09 +0000 | |
|---|---|---|
| committer | 2016-04-04 14:46:10 +0000 | |
| commit | e8c5480ba660232097bcc928fd7a82138e1af188 (patch) | |
| tree | 937a72291823e09984f228d125d3280c26d1d2c2 | |
| parent | 6dffdf82857e4016c6fb953039b0508cb1fd0f71 (diff) | |
| parent | 6e452f9e8a42f0f1217d25c9cf6017abdd5be08a (diff) | |
Merge "Don't try to compress .mkv resources" into nyc-dev
| -rw-r--r-- | tools/aapt/Package.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Package.cpp b/tools/aapt/Package.cpp index 641c34bd2dda..d631f3531127 100644 --- 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 */ |