commit 1bb1fe068a7e719711963c3cf3a50209e083a17f
author Ryan Mitchell <rtmitchell@google.com> Fri Nov 16 11:21:41 2018 -0800
committer Ryan Mitchell <rtmitchell@google.com> Tue Dec 11 13:48:45 2018 -0800
tree 70a6d9fbaa6e7f03626b92d345f73b48fcc3fa4a
parent c622083df99a87afef8348dd8e4bdfecf3050d94

Refactor policy parsing

This change removes the ability for an overlayable resource to be
defined in multiple policy blocks within the same overlayable. This
change also changes aapt2 to use a bit mask to keep track of the parsed
policies.

Bug: 110869880
Bug: 120298168
Test: aapt2_tests
Change-Id: Ie26cd913f94a16c0b312f222bccfa48f62feceaa

tools/aapt2/split/TableSplitter.cpp

diff --git a/tools/aapt2/split/TableSplitter.cpp b/tools/aapt2/split/TableSplitter.cpp
index 2e717ff..9c5b5d3 100644
--- a/tools/aapt2/split/TableSplitter.cpp
+++ b/tools/aapt2/split/TableSplitter.cpp
@@ -248,7 +248,7 @@
             if (!split_entry->id) {
               split_entry->id = entry->id;
               split_entry->visibility = entry->visibility;
-              split_entry->overlayable_declarations = entry->overlayable_declarations;
+              split_entry->overlayable = entry->overlayable;
             }
 
             // Copy the selected values into the new Split Entry.