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

Merge "Add ".webp" to default compress extensions" am: bf6a120aaa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430089

Change-Id: I0c50da091056cfb10c8f166eeb5cd50043c7d8d7
This commit is contained in:
Treehugger Robot
2020-09-17 20:12:02 +00:00
committed by Automerger Merge Worker
parent 93cd93c3b1 bf6a120aaa
commit f700df50c6
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/aapt2/cmd/Link.cpp
View File

@@ -2335,11 +2335,15 @@ int LinkCommand::Action(const std::vector<std::string>& args) {
} }
// Populate some default no-compress extensions that are already compressed. // Populate some default no-compress extensions that are already compressed.
options_.extensions_to_not_compress.insert( options_.extensions_to_not_compress.insert({
{".jpg", ".jpeg", ".png", ".gif", ".wav", ".mp2", ".mp3", ".ogg", // Image extensions
".aac", ".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet", ".rtttl", ".jpg", ".jpeg", ".png", ".gif", ".webp",
".imy", ".xmf", ".mp4", ".m4a", ".m4v", ".3gp", ".3gpp", ".3g2", // Audio extensions
".3gpp2", ".amr", ".awb", ".wma", ".wmv", ".webm", ".mkv"}); ".wav", ".mp2", ".mp3", ".ogg", ".aac", ".mid", ".midi", ".smf", ".jet", ".rtttl", ".imy",
".xmf", ".amr", ".awb",
// Audio/video extensions
".mpg", ".mpeg", ".mp4", ".m4a", ".m4v", ".3gp", ".3gpp", ".3g2", ".3gpp2", ".wma", ".wmv",
".webm", ".mkv"});
// Turn off auto versioning for static-libs. // Turn off auto versioning for static-libs.
if (context.GetPackageType() == PackageType::kStaticLib) { if (context.GetPackageType() == PackageType::kStaticLib) {