StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: I1c6d5146f3b2cc45bf9a768161ab8dad40f15b01
This commit is contained in:
Treehugger Robot
2022-03-03 00:41:26 +00:00
committed by Automerger Merge Worker
parent 9b65259574 168ea6a2b9
commit 6fd34f2965
2 changed files with 368 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

922
tools/releasetools/merge_target_files.py
View File

File diff suppressed because it is too large Load Diff

132
tools/releasetools/test_merge_target_files.py
View File

@@ -18,18 +18,26 @@ import os.path
import shutil import shutil
import common import common
import merge_target_files
import test_utils import test_utils
from merge_target_files import ( from merge_target_files import (
validate_config_lists, DEFAULT_FRAMEWORK_ITEM_LIST, validate_config_lists, DEFAULT_FRAMEWORK_ITEM_LIST,
DEFAULT_VENDOR_ITEM_LIST, DEFAULT_FRAMEWORK_MISC_INFO_KEYS, copy_items, DEFAULT_VENDOR_ITEM_LIST, DEFAULT_FRAMEWORK_MISC_INFO_KEYS, copy_items,
item_list_to_partition_set, process_apex_keys_apk_certs_common, item_list_to_partition_set, merge_package_keys_txt, compile_split_sepolicy,
compile_split_sepolicy, validate_merged_apex_info) validate_merged_apex_info)
class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase): class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase):
def setUp(self): def setUp(self):
self.testdata_dir = test_utils.get_testdata_dir() self.testdata_dir = test_utils.get_testdata_dir()
self.OPTIONS = merge_target_files.OPTIONS
self.OPTIONS.framework_item_list = DEFAULT_FRAMEWORK_ITEM_LIST
self.OPTIONS.framework_misc_info_keys = DEFAULT_FRAMEWORK_MISC_INFO_KEYS
self.OPTIONS.vendor_item_list = DEFAULT_VENDOR_ITEM_LIST
self.OPTIONS.framework_partition_set = set(
['product', 'system', 'system_ext'])
self.OPTIONS.vendor_partition_set = set(['odm', 'vendor'])
def test_copy_items_CopiesItemsMatchingPatterns(self): def test_copy_items_CopiesItemsMatchingPatterns(self):
@@ -84,76 +92,55 @@ class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase):
os.readlink(os.path.join(output_dir, 'a_link.cpp')), 'a.cpp') os.readlink(os.path.join(output_dir, 'a_link.cpp')), 'a.cpp')
def test_validate_config_lists_ReturnsFalseIfMissingDefaultItem(self): def test_validate_config_lists_ReturnsFalseIfMissingDefaultItem(self):
framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST) self.OPTIONS.framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST)
framework_item_list.remove('SYSTEM/*') self.OPTIONS.framework_item_list.remove('SYSTEM/*')
self.assertFalse( self.assertFalse(validate_config_lists())
validate_config_lists(framework_item_list,
DEFAULT_FRAMEWORK_MISC_INFO_KEYS,
DEFAULT_VENDOR_ITEM_LIST))
def test_validate_config_lists_ReturnsTrueIfDefaultItemInDifferentList(self): def test_validate_config_lists_ReturnsTrueIfDefaultItemInDifferentList(self):
framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST) self.OPTIONS.framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST)
framework_item_list.remove('ROOT/*') self.OPTIONS.framework_item_list.remove('ROOT/*')
vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST) self.OPTIONS.vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST)
vendor_item_list.append('ROOT/*') self.OPTIONS.vendor_item_list.append('ROOT/*')
self.assertTrue( self.assertTrue(validate_config_lists())
validate_config_lists(framework_item_list,
DEFAULT_FRAMEWORK_MISC_INFO_KEYS,
vendor_item_list))
def test_validate_config_lists_ReturnsTrueIfExtraItem(self): def test_validate_config_lists_ReturnsTrueIfExtraItem(self):
framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST) self.OPTIONS.framework_item_list = list(DEFAULT_FRAMEWORK_ITEM_LIST)
framework_item_list.append('MY_NEW_PARTITION/*') self.OPTIONS.framework_item_list.append('MY_NEW_PARTITION/*')
self.assertTrue( self.assertTrue(validate_config_lists())
validate_config_lists(framework_item_list,
DEFAULT_FRAMEWORK_MISC_INFO_KEYS,
DEFAULT_VENDOR_ITEM_LIST))
def test_validate_config_lists_ReturnsFalseIfSharedExtractedPartition(self): def test_validate_config_lists_ReturnsFalseIfSharedExtractedPartition(self):
vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST) self.OPTIONS.vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST)
vendor_item_list.append('SYSTEM/my_system_file') self.OPTIONS.vendor_item_list.append('SYSTEM/my_system_file')
self.assertFalse( self.assertFalse(validate_config_lists())
validate_config_lists(DEFAULT_FRAMEWORK_ITEM_LIST,
DEFAULT_FRAMEWORK_MISC_INFO_KEYS,
vendor_item_list))
def test_validate_config_lists_ReturnsFalseIfSharedExtractedPartitionImage( def test_validate_config_lists_ReturnsFalseIfSharedExtractedPartitionImage(
self): self):
vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST) self.OPTIONS.vendor_item_list = list(DEFAULT_VENDOR_ITEM_LIST)
vendor_item_list.append('IMAGES/system.img') self.OPTIONS.vendor_item_list.append('IMAGES/system.img')
self.assertFalse( self.assertFalse(validate_config_lists())
validate_config_lists(DEFAULT_FRAMEWORK_ITEM_LIST,
DEFAULT_FRAMEWORK_MISC_INFO_KEYS,
vendor_item_list))
def test_validate_config_lists_ReturnsFalseIfBadSystemMiscInfoKeys(self): def test_validate_config_lists_ReturnsFalseIfBadSystemMiscInfoKeys(self):
for bad_key in ['dynamic_partition_list', 'super_partition_groups']: for bad_key in ['dynamic_partition_list', 'super_partition_groups']:
framework_misc_info_keys = list(DEFAULT_FRAMEWORK_MISC_INFO_KEYS) self.OPTIONS.framework_misc_info_keys = list(
framework_misc_info_keys.append(bad_key) DEFAULT_FRAMEWORK_MISC_INFO_KEYS)
self.assertFalse( self.OPTIONS.framework_misc_info_keys.append(bad_key)
validate_config_lists(DEFAULT_FRAMEWORK_ITEM_LIST, self.assertFalse(validate_config_lists())
framework_misc_info_keys,
DEFAULT_VENDOR_ITEM_LIST))
def test_process_apex_keys_apk_certs_ReturnsTrueIfNoConflicts(self): def test_merge_package_keys_txt_ReturnsTrueIfNoConflicts(self):
output_dir = common.MakeTempDir() output_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(output_dir, 'META'))
framework_dir = common.MakeTempDir() framework_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(framework_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apexkeys_framework.txt'), os.path.join(self.testdata_dir, 'apexkeys_framework.txt'),
os.path.join(framework_dir, 'META', 'apexkeys.txt')) os.path.join(framework_meta_dir, 'apexkeys.txt'))
vendor_dir = common.MakeTempDir() vendor_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(vendor_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apexkeys_vendor.txt'), os.path.join(self.testdata_dir, 'apexkeys_vendor.txt'),
os.path.join(vendor_dir, 'META', 'apexkeys.txt')) os.path.join(vendor_meta_dir, 'apexkeys.txt'))
process_apex_keys_apk_certs_common(framework_dir, vendor_dir, output_dir, merge_package_keys_txt(framework_meta_dir, vendor_meta_dir, output_meta_dir,
set(['product', 'system', 'system_ext']), 'apexkeys.txt')
set(['odm', 'vendor']), 'apexkeys.txt')
merged_entries = [] merged_entries = []
merged_path = os.path.join(self.testdata_dir, 'apexkeys_merge.txt') merged_path = os.path.join(self.testdata_dir, 'apexkeys_merge.txt')
@@ -162,7 +149,7 @@ class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase):
merged_entries = f.read().split('\n') merged_entries = f.read().split('\n')
output_entries = [] output_entries = []
output_path = os.path.join(output_dir, 'META', 'apexkeys.txt') output_path = os.path.join(output_meta_dir, 'apexkeys.txt')
with open(output_path) as f: with open(output_path) as f:
output_entries = f.read().split('\n') output_entries = f.read().split('\n')
@@ -170,45 +157,36 @@ class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase):
return self.assertEqual(merged_entries, output_entries) return self.assertEqual(merged_entries, output_entries)
def test_process_apex_keys_apk_certs_ReturnsFalseIfConflictsPresent(self): def test_process_apex_keys_apk_certs_ReturnsFalseIfConflictsPresent(self):
output_dir = common.MakeTempDir() output_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(output_dir, 'META'))
framework_dir = common.MakeTempDir() framework_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(framework_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apexkeys_framework.txt'), os.path.join(self.testdata_dir, 'apexkeys_framework.txt'),
os.path.join(framework_dir, 'META', 'apexkeys.txt')) os.path.join(framework_meta_dir, 'apexkeys.txt'))
conflict_dir = common.MakeTempDir() conflict_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(conflict_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apexkeys_framework_conflict.txt'), os.path.join(self.testdata_dir, 'apexkeys_framework_conflict.txt'),
os.path.join(conflict_dir, 'META', 'apexkeys.txt')) os.path.join(conflict_meta_dir, 'apexkeys.txt'))
self.assertRaises(ValueError, process_apex_keys_apk_certs_common, self.assertRaises(ValueError, merge_package_keys_txt, framework_meta_dir,
framework_dir, conflict_dir, output_dir, conflict_meta_dir, output_meta_dir, 'apexkeys.txt')
set(['product', 'system', 'system_ext']),
set(['odm', 'vendor']), 'apexkeys.txt')
def test_process_apex_keys_apk_certs_HandlesApkCertsSyntax(self): def test_process_apex_keys_apk_certs_HandlesApkCertsSyntax(self):
output_dir = common.MakeTempDir() output_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(output_dir, 'META'))
framework_dir = common.MakeTempDir() framework_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(framework_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apkcerts_framework.txt'), os.path.join(self.testdata_dir, 'apkcerts_framework.txt'),
os.path.join(framework_dir, 'META', 'apkcerts.txt')) os.path.join(framework_meta_dir, 'apkcerts.txt'))
vendor_dir = common.MakeTempDir() vendor_meta_dir = common.MakeTempDir()
os.makedirs(os.path.join(vendor_dir, 'META'))
os.symlink( os.symlink(
os.path.join(self.testdata_dir, 'apkcerts_vendor.txt'), os.path.join(self.testdata_dir, 'apkcerts_vendor.txt'),
os.path.join(vendor_dir, 'META', 'apkcerts.txt')) os.path.join(vendor_meta_dir, 'apkcerts.txt'))
process_apex_keys_apk_certs_common(framework_dir, vendor_dir, output_dir, merge_package_keys_txt(framework_meta_dir, vendor_meta_dir, output_meta_dir,
set(['product', 'system', 'system_ext']), 'apkcerts.txt')
set(['odm', 'vendor']), 'apkcerts.txt')
merged_entries = [] merged_entries = []
merged_path = os.path.join(self.testdata_dir, 'apkcerts_merge.txt') merged_path = os.path.join(self.testdata_dir, 'apkcerts_merge.txt')
@@ -217,7 +195,7 @@ class MergeTargetFilesTest(test_utils.ReleaseToolsTestCase):
merged_entries = f.read().split('\n') merged_entries = f.read().split('\n')
output_entries = [] output_entries = []
output_path = os.path.join(output_dir, 'META', 'apkcerts.txt') output_path = os.path.join(output_meta_dir, 'apkcerts.txt')
with open(output_path) as f: with open(output_path) as f:
output_entries = f.read().split('\n') output_entries = f.read().split('\n')