Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e8c5480

* commit 'e8c5480ba660232097bcc928fd7a82138e1af188':
  Don't try to compress .mkv resources

Change-Id: Ifd8bd3c817e7a656c68dec8c1841d6cea2b9df32
This commit is contained in:
Wonsik Kim
2016-04-04 14:53:14 +00:00
committed by android-build-merger
parent c8647f9ea4 e8c5480ba6
commit 9a4ec086a2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt/Package.cpp
View File

@@ -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 */