Merge "Fix syntax error for SignApexFile" am: bbf17e92e5

am: 23341af32b Change-Id: I7cdf1dfe3070d854958935337e5c2c6269b58233
2019-12-04 13:11:16 -08:00
parent 957356df1f 23341af32b
commit 9b1bc61305
2 changed files with 4 additions and 3 deletions
--- a/tools/releasetools/sign_apex.py
+++ b/tools/releasetools/sign_apex.py
@@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)


 def SignApexFile(avbtool, apex_file, payload_key, container_key,
-                 signing_args=None):
+                 no_hashtree, signing_args=None):
  """Signs the given apex file."""
  with open(apex_file, 'rb') as input_fp:
    apex_data = input_fp.read()
@@ -56,7 +56,7 @@ def SignApexFile(avbtool, apex_file, payload_key, container_key,
      container_key=container_key,
      container_pw=None,
      codename_to_api_level_map=None,
-      no_hashtree=False,
+      no_hashtree=no_hashtree,
      signing_args=signing_args)


--- a/tools/releasetools/test_sign_apex.py
+++ b/tools/releasetools/test_sign_apex.py
@@ -38,5 +38,6 @@ class SignApexTest(test_utils.ReleaseToolsTestCase):
        'avbtool',
        foo_apex,
        payload_key,
-        container_key)
+        container_key,
+        False)
    self.assertTrue(os.path.exists(signed_foo_apex))