diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-19 17:57:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-19 17:57:33 +0000 |
| commit | 72864d29300adb65c1b677a676ab96de9440d1b0 (patch) | |
| tree | 715f9c7a9dbf1ad9aaf806cf1202a829fafc61fa /tools/aapt2/format/binary/TableFlattener_test.cpp | |
| parent | b3230cd639be832c1650e419d5b91aef9f94a324 (diff) | |
| parent | 70e02d428565b1cb9882ad2aa04ba7636fa3f099 (diff) | |
Merge changes I1d3e5e66,I86b869af,Iab4d3902,I645ee722
* changes:
Fix <overlay-config-signature> comments
Fix non-inclusive OMS test language
Remove malloc/free for inline overlay values
OMS: Add config_signature policy handling
Diffstat (limited to 'tools/aapt2/format/binary/TableFlattener_test.cpp')
| -rw-r--r-- | tools/aapt2/format/binary/TableFlattener_test.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/aapt2/format/binary/TableFlattener_test.cpp b/tools/aapt2/format/binary/TableFlattener_test.cpp index 59627ce579af..6932baf76c75 100644 --- a/tools/aapt2/format/binary/TableFlattener_test.cpp +++ b/tools/aapt2/format/binary/TableFlattener_test.cpp @@ -776,6 +776,7 @@ TEST_F(TableFlattenerTest, FlattenMultipleOverlayable) { OverlayableItem overlayable_item_three(group_one); overlayable_item_three.policies |= PolicyFlags::SIGNATURE; overlayable_item_three.policies |= PolicyFlags::ACTOR_SIGNATURE; + overlayable_item_three.policies |= PolicyFlags::CONFIG_SIGNATURE; std::unique_ptr<ResourceTable> table = test::ResourceTableBuilder() @@ -830,7 +831,8 @@ TEST_F(TableFlattenerTest, FlattenMultipleOverlayable) { EXPECT_EQ(result_overlayable.overlayable->name, "OtherName"); EXPECT_EQ(result_overlayable.overlayable->actor, "overlay://customization"); EXPECT_EQ(result_overlayable.policies, PolicyFlags::SIGNATURE - | PolicyFlags::ACTOR_SIGNATURE); + | PolicyFlags::ACTOR_SIGNATURE + | PolicyFlags::CONFIG_SIGNATURE); } TEST_F(TableFlattenerTest, FlattenOverlayableNoPolicyFails) { |