commit 9e4f52b2e5c76791edc885397389771692c0de8a
author Ryan Mitchell <rtmitchell@google.com> Thu Sep 19 12:15:52 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Fri Oct 04 16:11:37 2019 -0700
tree 5b9927394ed97e11009b4782b2fc494f3aa32276
parent cd965a3224c581d8eae28e052fcf577974104830

Parse <overlay> and abstract resource mapping

This change introduces idmap parsing of <overlay> tags.

The <overlay> tag allows one to explicitly map resources in the target
to either a resource in the overlay or an inline attribute value.

Use the android:resourcesMap atttribute on the <overlay> tag in the
android manifest to specify a file to provide the resource mapping.

Bug: 135943783
Bug: 135051420
Test: idmap2_tests
Change-Id: I1740dcdc01849c43b1f2cb8c6645d666dbb05dba

cmds/idmap2/Android.bp

diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index 60d6414..41a1706 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -43,6 +43,7 @@
         "libidmap2/Policies.cpp",
         "libidmap2/PrettyPrintVisitor.cpp",
         "libidmap2/RawPrintVisitor.cpp",
+        "libidmap2/ResourceMapping.cpp",
         "libidmap2/ResourceUtils.cpp",
         "libidmap2/Result.cpp",
         "libidmap2/XmlParser.cpp",
@@ -97,6 +98,7 @@
         "tests/PoliciesTests.cpp",
         "tests/PrettyPrintVisitorTests.cpp",
         "tests/RawPrintVisitorTests.cpp",
+        "tests/ResourceMappingTests.cpp",
         "tests/ResourceUtilsTests.cpp",
         "tests/ResultTests.cpp",
         "tests/XmlParserTests.cpp",