commit 19c3feb2d354306fe7d36cb3c04b8a6f4ce951fc
author Bill Peckham <bpeckham@google.com> Fri Mar 20 18:31:43 2020 -0700
committer Bill Peckham <bpeckham@google.com> Mon Mar 30 22:33:27 2020 +0000
tree 1db86c7fb4ad40d0cf771c763efd2513f5913874
parent 337f42e7d13fc75a095590fe6cc99c4f3a91aef3

Build merged apexkeys.txt/apkcerts.txt by partition.

Propagate partition tag data to apexkeys.txt and
apkcerts.txt so that merge_target_files.py can build
merged versions of these files by filtering the
framework files for framework partitions and filtering
the vendor files for vendor partitions.

Bug: 138942268
Change-Id: Ic3226728e97dae84d38ec230ccc86d1b124bea94

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 3276b29..2030d5a 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1754,7 +1754,8 @@
       continue
     m = re.match(
         r'^name="(?P<NAME>.*)"\s+certificate="(?P<CERT>.*)"\s+'
-        r'private_key="(?P<PRIVKEY>.*?)"(\s+compressed="(?P<COMPRESSED>.*)")?$',
+        r'private_key="(?P<PRIVKEY>.*?)"(\s+compressed="(?P<COMPRESSED>.*)")?'
+        r'(\s+partition="(?P<PARTITION>.*)")?$',
         line)
     if not m:
       continue