diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-17 17:52:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-17 17:52:04 +0000 |
| commit | bf6a120aaaef4b9589db75278961ddcd8846fc57 (patch) | |
| tree | 5322014e1b9f65ed8c4a187a07826a91c3371e04 /tools | |
| parent | db0a92a881e5d542528429849528e66ce29f6aa1 (diff) | |
| parent | 59cefc8403ce2933a13687e6224ea4682c26434d (diff) | |
Merge "Add ".webp" to default compress extensions"
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt2/cmd/Link.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 72cb41a1b172..fd12d02434fa 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -2335,11 +2335,15 @@ int LinkCommand::Action(const std::vector<std::string>& args) { } // Populate some default no-compress extensions that are already compressed. - options_.extensions_to_not_compress.insert( - {".jpg", ".jpeg", ".png", ".gif", ".wav", ".mp2", ".mp3", ".ogg", - ".aac", ".mpg", ".mpeg", ".mid", ".midi", ".smf", ".jet", ".rtttl", - ".imy", ".xmf", ".mp4", ".m4a", ".m4v", ".3gp", ".3gpp", ".3g2", - ".3gpp2", ".amr", ".awb", ".wma", ".wmv", ".webm", ".mkv"}); + options_.extensions_to_not_compress.insert({ + // Image extensions + ".jpg", ".jpeg", ".png", ".gif", ".webp", + // Audio extensions + ".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. if (context.GetPackageType() == PackageType::kStaticLib) { |