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

Commit 61d528f4 authored by Mohamed Heikal's avatar Mohamed Heikal
Browse files

Fix bug where aapt2 optimize obfuscated color-* resources 

aapt2 optimize --enable-resource-path-shortening should ignore res/color
resources since android uses the path while loading them. This cl fixes
a bug where res/color-* (eg: res/color-v21) resource paths are shortened
when they should not be.

Test: make aapt2_tests
Bug: b/75965637
Change-Id: Ibbc3fe4d2e6bd4f31765a5aa85980907dc013ecd
parent 59dc6124

tools/aapt2/optimize/ResourcePathShortener.cpp

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include "ResourceTable.h"

#include "ValueVisitor.h"

#include "util/Util.h"





static const std::string base64_chars =
@@ -95,8 +96,8 @@ bool ResourcePathShortener::Consume(IAaptContext* context, ResourceTable* table) 
    android::StringPiece res_subdir, actual_filename, extension;

    util::ExtractResFilePathParts(*file_ref->path, &res_subdir, &actual_filename, &extension);



    // Android detects ColorStateLists via pathname, skip res/color/*

    if (res_subdir == android::StringPiece("res/color/"))

    // Android detects ColorStateLists via pathname, skip res/color*

    if (util::StartsWith(res_subdir, "res/color"))

      continue;



    std::string shortened_filename = ShortenFileName(*file_ref->path, num_chars);

tools/aapt2/optimize/ResourcePathShortener_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ TEST(ResourcePathShortenerTest, SkipColorFileRefPaths) { 
  std::unique_ptr<ResourceTable> table =

      test::ResourceTableBuilder()

          .AddFileReference("android:color/colorlist", "res/color/colorlist.xml")

          .AddFileReference("android:color/colorlist",

                            "res/color-mdp-v21/colorlist.xml",

                            test::ParseConfigOrDie("mdp-v21"))

          .Build();



  std::map<std::string, std::string> path_map;
@@ -82,6 +85,7 @@ TEST(ResourcePathShortenerTest, SkipColorFileRefPaths) { 


  // Expect that the path map to not contain the ColorStateList

  ASSERT_THAT(path_map.find("res/color/colorlist.xml"), Eq(path_map.end()));

  ASSERT_THAT(path_map.find("res/color-mdp-v21/colorlist.xml"), Eq(path_map.end()));

}



TEST(ResourcePathShortenerTest, KeepExtensions) {