summaryrefslogtreecommitdiff
path: root/tools/aapt2/format/binary/BinaryResourceParser.cpp
diff options
context:
space:
mode:
authorRyan Mitchell <rtmitchell@google.com>2019-02-07 20:07:21 -0800
committerRyan Mitchell <rtmitchell@google.com>2019-02-07 20:28:26 -0800
commitb5b162bfe68e3c004ad606a83af07a02cd15cd82 (patch)
tree7164724d1cbd2436c32f060e25f0a2964f037da1 /tools/aapt2/format/binary/BinaryResourceParser.cpp
parent31e6a70ca1f4c92da43468cb1da67b0e68773f10 (diff)
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
Diffstat (limited to 'tools/aapt2/format/binary/BinaryResourceParser.cpp')
-rw-r--r--tools/aapt2/format/binary/BinaryResourceParser.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/aapt2/format/binary/BinaryResourceParser.cpp b/tools/aapt2/format/binary/BinaryResourceParser.cpp
index 40aaa05c2b30..69ea460a113c 100644
--- a/tools/aapt2/format/binary/BinaryResourceParser.cpp
+++ b/tools/aapt2/format/binary/BinaryResourceParser.cpp
@@ -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;