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

Commit 2090094e authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "AAPT2: support removed_ entries in groups" into tm-dev am: 2222f486 

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

Change-Id: I6fbb32ad5eb74223bba1950cedf3665007cf1f76
parents bae82662 2222f486

tools/aapt2/ResourceParser.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,13 @@ bool static ParseGroupImpl(xml::XmlPullParser* parser, ParsedResource* out_resou 
        continue;

      }



      if (maybe_name.value().substr(0, std::strlen("removed_")) == "removed_") {

        // Skip resources that have been removed from the framework, but leave a hole so that

        // other staged resources don't shift and break apps previously compiled against them

        next_id.id++;

        continue;

      }



      ParsedResource& entry_res = out_resource->child_resources.emplace_back(ParsedResource{

          .name = ResourceName{{}, parsed_type, maybe_name.value().to_string()},

          .source = item_source,