commit 7bd09911a216d5b386d1ae927854b1b11db76d26
author Kelvin Zhang <zhangkelvin@google.com> Thu Jan 21 10:33:13 2021 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Tue Jan 26 12:42:52 2021 -0500
tree 7cb79585ce7a068df043eed5207fc19657587bac
parent 22c687c5c3c070b58ddc075c3a8bbf868323ec19

Add apex_info.pb to generated OTA

Test: generate an OTA, make sure apex_info.pb is in

Bug: 172911822

Change-Id: I13a6ef4bc1f6ed2d146922f3031ea24700ba06f4

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 70f1020..41644d8 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1142,6 +1142,15 @@
     else:
       logger.warning("Cannot find care map file in target_file package")
 
+  # Copy apex_info.pb over to generated OTA package.
+  try:
+    apex_info_entry = target_zip.getinfo("META/apex_info.pb")
+    with target_zip.open(apex_info_entry, "r") as zfp:
+      common.ZipWriteStr(output_zip, "apex_info.pb", zfp.read(),
+                        compress_type=zipfile.ZIP_STORED)
+  except KeyError:
+    logger.warning("target_file doesn't contain apex_info.pb %s", target_file)
+
   common.ZipClose(target_zip)
 
   CheckVintfIfTrebleEnabled(target_file, target_info)