summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author MÃ¥rten Kongstad <marten.kongstad@sony.com> 2018-10-11 08:38:08 +0200
committer Ryan Mitchell <rtmitchell@google.com> 2018-11-07 08:23:06 -0800
commit4b55bd77fb69629798e3221025e0740252cbfe41 (patch)
treed728588b86154588e68ef0d777272d5b6b2093ba
parent70c02611090acb5627aaa71b3d5cbac8229c80d7 (diff)
AAPT2: propagate SPEC_OVERLAYABLE to splits
A resource marked SPEC_OVERLAYABLE in the base package was not marked as such in the corresponding split packages. Add missing copy statement. Test: manual (aapt2 dump test content in libandroidfw) Change-Id: I800e92111a9da7c6f5e83f8a546d260c8d93b308 (cherry picked from commit ee41b3a36dcd87f79f3c2a21383a97743530099d)
-rw-r--r--tools/aapt2/split/TableSplitter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt2/split/TableSplitter.cpp b/tools/aapt2/split/TableSplitter.cpp
index 414758e14063..2e717ff2bc3b 100644
--- a/tools/aapt2/split/TableSplitter.cpp
+++ b/tools/aapt2/split/TableSplitter.cpp
@@ -248,6 +248,7 @@ void TableSplitter::SplitTable(ResourceTable* original_table) {
if (!split_entry->id) {
split_entry->id = entry->id;
split_entry->visibility = entry->visibility;
+ split_entry->overlayable_declarations = entry->overlayable_declarations;
}
// Copy the selected values into the new Split Entry.