tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix syntax error for SignApexFile" am: bbf17e92e5 am: 9b1bc61305

Browse source 
Change-Id: Ic16f53cd67f9e3659349399ef1bef7a791f21d76
This commit is contained in:
Automerger Merge Worker 2019-12-04 21:21:07 +00:00
commit 8bf284658e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/releasetools/sign_apex.py
View file

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

3
tools/releasetools/test_sign_apex.py
View file

@ -38,5 +38,6 @@ class SignApexTest(test_utils.ReleaseToolsTestCase):
'avbtool', 'avbtool',
foo_apex, foo_apex,
payload_key, payload_key,
container_key) container_key,
False)
self.assertTrue(os.path.exists(signed_foo_apex)) self.assertTrue(os.path.exists(signed_foo_apex))