From 59cefc8403ce2933a13687e6224ea4682c26434d Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 14 Sep 2020 10:28:14 -0700 Subject: Add ".webp" to default compress extensions The .webp extension contains compressed image data so do not deflate .webp files in APKs. Bug: 166137617 Test: aapt2 link Merged-In: I70181437e0b51122c7aa5047bd0a0791ac3b8df6 Change-Id: I70181437e0b51122c7aa5047bd0a0791ac3b8df6 --- tools/aapt2/cmd/Link.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 85414fb8a4e5..6e5b7a191287 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -2220,11 +2220,15 @@ int LinkCommand::Action(const std::vector& 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) { -- cgit v1.2.3