commit da308bf7732275ab9dcd2b45fd2fc74ab07a1985
author Melisa Carranza Zúñiga <melisacz@google.com> Tue Apr 12 23:22:11 2022 +0000
committer Melisa Carranza Zúñiga <melisacz@google.com> Tue May 31 09:55:22 2022 +0000
tree f8486d2197b1d99b7501a2f267b4db89da66966d
parent d0035d5d8817fcbfd3ef92e3dc35c92805257890

Revert "Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275 am: a2db49becd"

Test: sign_target_files_apks target_files.zip target_out.zip

This reverts commit 6e6c22c70e48e9d4fe830fe0c5b9c47618bd116a.

Reason for revert: Updateable SEPolicy is punted.

Change-Id: I99524d13811028a4036aa85c74cf10974fe08165
Merged-In: I99524d13811028a4036aa85c74cf10974fe08165

tools/releasetools/sign_apex.py

diff --git a/tools/releasetools/sign_apex.py b/tools/releasetools/sign_apex.py
index a68f1ec..722359b 100755
--- a/tools/releasetools/sign_apex.py
+++ b/tools/releasetools/sign_apex.py
@@ -61,7 +61,6 @@
 import common
 
 logger = logging.getLogger(__name__)
-OPTIONS = common.OPTIONS
 
 
 def SignApexFile(avbtool, apex_file, payload_key, container_key, no_hashtree,
@@ -82,7 +81,7 @@
       apk_keys=apk_keys,
       signing_args=signing_args,
       sign_tool=sign_tool,
-      is_sepolicy=apex_file.endswith(OPTIONS.sepolicy_name),
+      is_sepolicy=apex_file.endswith("sepolicy.apex"),
       sepolicy_key=sepolicy_key,
       sepolicy_cert=sepolicy_cert,
       fsverity_tool=fsverity_tool)