Also store override_package_name and logging_parent in apex_build_info

This will help signing tools to preserve correct package_name and
logging_parent tag of the outer APK container of an APEX

Test: apexer_test
Bug: 152084536
Change-Id: I7569acf20efe6ff64c3bdc7c43c07a0690c27bee

1 files changed, 16 insertions, 0 deletions

diff --git a/apexer/apexer.py b/apexer/apexer.py
index a8c92cc..d610e42 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -331,6 +331,16 @@ def ValidateArgs(args):
       if build_info.min_sdk_version:
         args.min_sdk_version = build_info.min_sdk_version
 
+  if not args.override_apk_package_name:
+    if build_info is not None:
+      if build_info.override_apk_package_name:
+        args.override_apk_package_name = build_info.override_apk_package_name
+
+  if not args.logging_parent:
+    if build_info is not None:
+      if build_info.logging_parent:
+        args.logging_parent = build_info.logging_parent
+
   return True
 
 def GenerateBuildInfo(args):
@@ -356,6 +366,12 @@ def GenerateBuildInfo(args):
   if args.no_hashtree:
     build_info.no_hashtree = True
 
+  if args.override_apk_package_name:
+    build_info.override_apk_package_name = args.override_apk_package_name
+
+  if args.logging_parent:
+    build_info.logging_parent = args.logging_parent
+
   return build_info
 
 def AddLoggingParent(android_manifest, logging_parent_value):