releasetools: Skip signing APKs with given prefixes.
We may pack prebuilts that end with ".apk" into target_files zip, via PRODUCT_COPY_FILES. META/apkcerts.txt won't contain the cert info for such files, and we want to keep them as is while signing, despite of the ".apk" extension. This CL adds "--skip_apks_with_path_prefix" option to sign_target_files_apks.py. APKs with matching prefixes will be copied verbatim into the signed images. The prefix should match the entry names in the target_files (e.g. "SYSTEM_OTHER/preloads/"). The option may be repeated to specify multiple prefixes. Note that although we may skip signing an APK file with "-e ApkName=". This would skip *all* the APK files with the matching basename. "--skip_apks_with_path_prefix" allows matching the exact prefix. For example: $ ./build/make/tools/releasetools/sign_target_files_apks.py \ --skip_apks_with_path_prefix SYSTEM_OTHER/preloads/ \ --skip_apks_with_path_prefix PRODUCT/prebuilts/PrebuiltApp1 \ --skip_apks_with_path_prefix VENDOR/app/PrebuiltApp2.apk \ target_files.zip \ signed-target_files.zip Bug: 110201128 Test: Run the command above and check the logs. Test: `python -m unittest test_sign_target_files_apks` Change-Id: I7bd80b360917cef137cf1e7e8cfa796968831f47
This commit is contained in:
@@ -237,25 +237,116 @@ class SignTargetFilesApksTest(unittest.TestCase):
|
||||
AssertionError, CheckAllApksSigned, input_zip, apk_key_map, '.gz')
|
||||
|
||||
def test_GetApkFileInfo(self):
|
||||
(is_apk, is_compressed) = GetApkFileInfo("PRODUCT/apps/Chats.apk", None)
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/apps/Chats.apk", None, [])
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed) = GetApkFileInfo("PRODUCT/apps/Chats.dat", None)
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/apps/Chats.apk", None, [])
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/apps/Chats.dat", None, [])
|
||||
self.assertFalse(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
def test_GetApkFileInfo_withCompressedApks(self):
|
||||
(is_apk, is_compressed) = GetApkFileInfo("PRODUCT/apps/Chats.apk.gz", ".gz")
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/apps/Chats.apk.gz", ".gz", [])
|
||||
self.assertTrue(is_apk)
|
||||
self.assertTrue(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed) = GetApkFileInfo("PRODUCT/apps/Chats.apk.gz", ".xz")
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/apps/Chats.apk.gz", ".xz", [])
|
||||
self.assertFalse(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
self.assertRaises(
|
||||
AssertionError, GetApkFileInfo, "PRODUCT/apps/Chats.apk", "")
|
||||
AssertionError, GetApkFileInfo, "PRODUCT/apps/Chats.apk", "", [])
|
||||
|
||||
self.assertRaises(
|
||||
AssertionError, GetApkFileInfo, "PRODUCT/apps/Chats.apk", "apk")
|
||||
AssertionError, GetApkFileInfo, "PRODUCT/apps/Chats.apk", "apk", [])
|
||||
|
||||
def test_GetApkFileInfo_withSkippedPrefixes(self):
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/preloads/apps/Chats.apk", None, set())
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"PRODUCT/preloads/apps/Chats.apk",
|
||||
None,
|
||||
set(["PRODUCT/preloads/"]))
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None,
|
||||
set(["SYSTEM/preloads/", "SYSTEM_OTHER/preloads/"]))
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.apk.gz",
|
||||
".gz",
|
||||
set(["PRODUCT/prebuilts/", "SYSTEM_OTHER/preloads/"]))
|
||||
self.assertTrue(is_apk)
|
||||
self.assertTrue(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.dat",
|
||||
None,
|
||||
set(["SYSTEM_OTHER/preloads/"]))
|
||||
self.assertFalse(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertFalse(should_be_skipped)
|
||||
|
||||
def test_GetApkFileInfo_checkSkippedPrefixesInput(self):
|
||||
# set
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None,
|
||||
set(["SYSTEM_OTHER/preloads/"]))
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
# tuple
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None,
|
||||
("SYSTEM_OTHER/preloads/",))
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
# list
|
||||
(is_apk, is_compressed, should_be_skipped) = GetApkFileInfo(
|
||||
"SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None,
|
||||
["SYSTEM_OTHER/preloads/"])
|
||||
self.assertTrue(is_apk)
|
||||
self.assertFalse(is_compressed)
|
||||
self.assertTrue(should_be_skipped)
|
||||
|
||||
# str is invalid.
|
||||
self.assertRaises(
|
||||
AssertionError, GetApkFileInfo, "SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None, "SYSTEM_OTHER/preloads/")
|
||||
|
||||
# None is invalid.
|
||||
self.assertRaises(
|
||||
AssertionError, GetApkFileInfo, "SYSTEM_OTHER/preloads/apps/Chats.apk",
|
||||
None, None)
|
||||
|
Reference in New Issue
Block a user