Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59cefc84 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

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
parent 0a0bf365

tools/aapt2/cmd/Link.cpp

+9 −5
Original line number Diff line number Diff line
@@ -2220,11 +2220,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) {