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

Commit b5b162bf authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Do not derive source from binary APK 

When loading the binary APK, do not set the paths of Source structs to
the path of the binary APK. This causes the merge_zips step of the build
system to fail.

Bug: 124082573
Test: vendor/google/build/build_mainline_modules.sh
Change-Id: I84b8d43c5b6a5835e7ff6bd579c4eb744e02c20f
parent 31e6a70c

tools/aapt2/ResourceParser.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ bool ResourceParser::ParseOverlayable(xml::XmlPullParser* parser, ParsedResource 
  // Create a overlayable entry grouping that represents this <overlayable>

  auto overlayable = std::make_shared<Overlayable>(

      overlayable_name.value(), (overlayable_actor) ? overlayable_actor.value() : "",

      out_resource->source);

      source_);



  bool error = false;

  std::string comment;

tools/aapt2/format/binary/BinaryResourceParser.cpp

+0 −3
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package, 
    if (entry->flags & ResTable_entry::FLAG_PUBLIC) {

      Visibility visibility;

      visibility.level = Visibility::Level::kPublic;

      visibility.source = source_.WithLine(0);

      if (!table_->SetVisibilityWithIdMangled(name, visibility, res_id, diag_)) {

        return false;

      }
@@ -448,7 +447,6 @@ bool BinaryResourceParser::ParseOverlayable(const ResChunk_header* chunk) { 
                                                      arraysize(header->name)));

  overlayable->actor = util::Utf16ToUtf8(strcpy16_dtoh((const char16_t*)header->actor,

                                                       arraysize(header->name)));

  overlayable->source = source_.WithLine(0);



  ResChunkPullParser parser(GetChunkData(chunk),

                            GetChunkDataLen(chunk));
@@ -491,7 +489,6 @@ bool BinaryResourceParser::ParseOverlayable(const ResChunk_header* chunk) { 
        }



        OverlayableItem overlayable_item(overlayable);

        overlayable_item.source = source_.WithLine(0);

        overlayable_item.policies = policies;

        if (!table_->SetOverlayable(iter->second, overlayable_item, diag_)) {

          return false;