commit 137807d69ddd777c7230ef43f0448ae48bca1062
author Kelvin Zhang <zhangkelvin@google.com> Wed Sep 14 15:02:46 2022 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Fri Sep 30 09:19:57 2022 -0700
tree cb85bb255b5138d85143f0e0de1930ca3e7612de
parent 9d06081f67eba4484807df562a090e30eb3d177c

Support container password for apex signing

Some partners need the ability to sign apexes with passwords enabled.

Test: th
Bug: 206007131
Change-Id: I6abb0775031a4c6bf8aaae679f5c7ad8f4cffe46

tools/releasetools/apex_utils.py

diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 6730a25..d7b0ba2 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -540,7 +540,7 @@
           apex_file,
           payload_key=payload_key,
           container_key=container_key,
-          container_pw=None,
+          container_pw=container_pw,
           codename_to_api_level_map=codename_to_api_level_map,
           no_hashtree=no_hashtree,
           apk_keys=apk_keys,
@@ -553,7 +553,7 @@
           apex_file,
           payload_key=payload_key,
           container_key=container_key,
-          container_pw=None,
+          container_pw=container_pw,
           codename_to_api_level_map=codename_to_api_level_map,
           no_hashtree=no_hashtree,
           apk_keys=apk_keys,