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

Commit f700df50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0c50da091056cfb10c8f166eeb5cd50043c7d8d7
parents 93cd93c3 bf6a120a

tools/aapt2/cmd/Link.cpp

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