commit 448004af9d1b85f25e175e2097f14f89c904d4da
author Tao Bao <tbao@google.com> Thu Sep 19 07:55:02 2019 -0700
committer Tao Bao <tbao@google.com> Thu Sep 19 14:41:34 2019 -0700
tree d937690a69ce3730c6a59dec7d9a15d610e12842
parent 7be2b01f3c32211ba1c8f152c106c1516684f687

Don't generate hashtree when signing bundled APEXes.

Bug: 139957269
Test: Sign a target_files.zip. Extract a re-signed APEX and check the
      hashtree size (being zero).
Test: Use sign_apex to sign an APEX file. Check the hashtree size (not
      being zero).
Test: python -m unittest test_apex_utils
Test: python -m unittest test_sign_apex
Change-Id: I927b7681d66920d7732b700ec3a8f7a65b4cb351

tools/releasetools/sign_apex.py

diff --git a/tools/releasetools/sign_apex.py b/tools/releasetools/sign_apex.py
index 2516e15..f2daa46 100755
--- a/tools/releasetools/sign_apex.py
+++ b/tools/releasetools/sign_apex.py
@@ -56,6 +56,7 @@
       container_key=container_key,
       container_pw=None,
       codename_to_api_level_map=None,
+      no_hashtree=False,
       signing_args=signing_args)
 
 
@@ -103,7 +104,8 @@
       args[0],
       options['payload_key'],
       options['container_key'],
-      options.get('payload_extra_args'))
+      no_hashtree=False,
+      signing_args=options.get('payload_extra_args'))
   shutil.copyfile(signed_apex, args[1])
   logger.info("done.")