2019-02-02 00:52:10 +01:00
|
|
|
#!/usr/bin/env python
|
|
|
|
#
|
|
|
|
# Copyright (C) 2019 The Android Open Source Project
|
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
|
|
|
|
# use this file except in compliance with the License. You may obtain a copy of
|
|
|
|
# the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
|
|
# License for the specific language governing permissions and limitations under
|
|
|
|
# the License.
|
2019-07-18 19:11:07 +02:00
|
|
|
#
|
|
|
|
"""This script merges two partial target files packages.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
One package contains framework files, and the other contains vendor files.
|
2019-04-17 23:54:06 +02:00
|
|
|
It produces a complete target files package that can be used to generate an
|
|
|
|
OTA package.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
Usage: merge_target_files.py [args]
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
--framework-target-files framework-target-files-zip-archive
|
|
|
|
The input target files package containing framework bits. This is a zip
|
2019-02-02 00:52:10 +01:00
|
|
|
archive.
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
--framework-item-list framework-item-list-file
|
2019-03-07 22:01:48 +01:00
|
|
|
The optional path to a newline-separated config file that replaces the
|
2019-06-06 00:13:43 +02:00
|
|
|
contents of DEFAULT_FRAMEWORK_ITEM_LIST if provided.
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
--framework-misc-info-keys framework-misc-info-keys-file
|
2019-03-07 22:01:48 +01:00
|
|
|
The optional path to a newline-separated config file that replaces the
|
2019-06-06 00:13:43 +02:00
|
|
|
contents of DEFAULT_FRAMEWORK_MISC_INFO_KEYS if provided.
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
--vendor-target-files vendor-target-files-zip-archive
|
|
|
|
The input target files package containing vendor bits. This is a zip
|
2019-02-02 00:52:10 +01:00
|
|
|
archive.
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
--vendor-item-list vendor-item-list-file
|
2019-03-07 22:01:48 +01:00
|
|
|
The optional path to a newline-separated config file that replaces the
|
2019-06-06 00:13:43 +02:00
|
|
|
contents of DEFAULT_VENDOR_ITEM_LIST if provided.
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-02-02 00:52:10 +01:00
|
|
|
--output-target-files output-target-files-package
|
2019-04-15 18:47:24 +02:00
|
|
|
If provided, the output merged target files package. Also a zip archive.
|
|
|
|
|
|
|
|
--output-dir output-directory
|
|
|
|
If provided, the destination directory for saving merged files. Requires
|
|
|
|
the --output-item-list flag.
|
|
|
|
Can be provided alongside --output-target-files, or by itself.
|
|
|
|
|
|
|
|
--output-item-list output-item-list-file.
|
|
|
|
The optional path to a newline-separated config file that specifies the
|
|
|
|
file patterns to copy into the --output-dir. Required if providing
|
|
|
|
the --output-dir flag.
|
2019-03-15 22:36:21 +01:00
|
|
|
|
2019-04-17 01:11:35 +02:00
|
|
|
--output-ota output-ota-package
|
|
|
|
The output ota package. This is a zip archive. Use of this flag may
|
|
|
|
require passing the --path common flag; see common.py.
|
|
|
|
|
2019-04-18 21:32:18 +02:00
|
|
|
--output-img output-img-package
|
|
|
|
The output img package, suitable for use with 'fastboot update'. Use of
|
|
|
|
this flag may require passing the --path common flag; see common.py.
|
|
|
|
|
2019-04-15 20:34:56 +02:00
|
|
|
--output-super-empty output-super-empty-image
|
|
|
|
If provided, creates a super_empty.img file from the merged target
|
|
|
|
files package and saves it at this path.
|
|
|
|
|
2019-03-15 22:36:21 +01:00
|
|
|
--rebuild_recovery
|
|
|
|
Rebuild the recovery patch used by non-A/B devices and write it to the
|
|
|
|
system image.
|
2019-03-30 02:27:23 +01:00
|
|
|
|
|
|
|
--keep-tmp
|
|
|
|
Keep tempoary files for debugging purposes.
|
2019-02-02 00:52:10 +01:00
|
|
|
"""
|
|
|
|
|
|
|
|
from __future__ import print_function
|
|
|
|
|
|
|
|
import fnmatch
|
|
|
|
import logging
|
|
|
|
import os
|
2019-04-15 18:47:24 +02:00
|
|
|
import shutil
|
2019-04-25 23:18:16 +02:00
|
|
|
import subprocess
|
2019-02-02 00:52:10 +01:00
|
|
|
import sys
|
|
|
|
import zipfile
|
|
|
|
|
|
|
|
import add_img_to_target_files
|
2019-04-15 20:34:56 +02:00
|
|
|
import build_super_image
|
|
|
|
import common
|
2019-04-18 21:32:18 +02:00
|
|
|
import img_from_target_files
|
2019-04-17 01:11:35 +02:00
|
|
|
import ota_from_target_files
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
2019-06-28 01:52:12 +02:00
|
|
|
|
2019-02-02 00:52:10 +01:00
|
|
|
OPTIONS = common.OPTIONS
|
|
|
|
OPTIONS.verbose = True
|
2019-06-06 00:13:43 +02:00
|
|
|
OPTIONS.framework_target_files = None
|
|
|
|
OPTIONS.framework_item_list = None
|
|
|
|
OPTIONS.framework_misc_info_keys = None
|
|
|
|
OPTIONS.vendor_target_files = None
|
|
|
|
OPTIONS.vendor_item_list = None
|
2019-02-20 03:02:46 +01:00
|
|
|
OPTIONS.output_target_files = None
|
2019-04-15 18:47:24 +02:00
|
|
|
OPTIONS.output_dir = None
|
|
|
|
OPTIONS.output_item_list = None
|
2019-04-17 01:11:35 +02:00
|
|
|
OPTIONS.output_ota = None
|
2019-04-18 21:32:18 +02:00
|
|
|
OPTIONS.output_img = None
|
2019-04-15 20:34:56 +02:00
|
|
|
OPTIONS.output_super_empty = None
|
2019-03-15 22:36:21 +01:00
|
|
|
OPTIONS.rebuild_recovery = False
|
2019-02-20 03:02:46 +01:00
|
|
|
OPTIONS.keep_tmp = False
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# DEFAULT_FRAMEWORK_ITEM_LIST is a list of items to extract from the partial
|
|
|
|
# framework target files package as is, meaning these items will land in the
|
2019-02-02 00:52:10 +01:00
|
|
|
# output target files package exactly as they appear in the input partial
|
2019-06-06 00:13:43 +02:00
|
|
|
# framework target files package.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
DEFAULT_FRAMEWORK_ITEM_LIST = (
|
2019-02-02 00:52:10 +01:00
|
|
|
'META/apkcerts.txt',
|
|
|
|
'META/filesystem_config.txt',
|
|
|
|
'META/root_filesystem_config.txt',
|
|
|
|
'META/system_manifest.xml',
|
|
|
|
'META/system_matrix.xml',
|
|
|
|
'META/update_engine_config.txt',
|
|
|
|
'PRODUCT/*',
|
|
|
|
'ROOT/*',
|
|
|
|
'SYSTEM/*',
|
2019-05-22 19:47:08 +02:00
|
|
|
)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# FRAMEWORK_EXTRACT_SPECIAL_ITEM_LIST is a list of items to extract from the
|
|
|
|
# partial framework target files package that need some special processing, such
|
|
|
|
# as some sort of combination with items from the partial vendor target files
|
2019-02-02 00:52:10 +01:00
|
|
|
# package.
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
FRAMEWORK_EXTRACT_SPECIAL_ITEM_LIST = ('META/*',)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# DEFAULT_FRAMEWORK_MISC_INFO_KEYS is a list of keys to obtain from the
|
|
|
|
# framework instance of META/misc_info.txt. The remaining keys from the
|
|
|
|
# vendor instance.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
DEFAULT_FRAMEWORK_MISC_INFO_KEYS = (
|
2019-02-02 00:52:10 +01:00
|
|
|
'avb_system_hashtree_enable',
|
|
|
|
'avb_system_add_hashtree_footer_args',
|
|
|
|
'avb_system_key_path',
|
|
|
|
'avb_system_algorithm',
|
|
|
|
'avb_system_rollback_index_location',
|
|
|
|
'avb_product_hashtree_enable',
|
|
|
|
'avb_product_add_hashtree_footer_args',
|
2019-06-25 08:58:13 +02:00
|
|
|
'avb_system_ext_hashtree_enable',
|
|
|
|
'avb_system_ext_add_hashtree_footer_args',
|
2019-02-02 00:52:10 +01:00
|
|
|
'system_root_image',
|
|
|
|
'root_dir',
|
|
|
|
'ab_update',
|
|
|
|
'default_system_dev_certificate',
|
|
|
|
'system_size',
|
2019-05-22 19:47:08 +02:00
|
|
|
)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# DEFAULT_VENDOR_ITEM_LIST is a list of items to extract from the partial
|
|
|
|
# vendor target files package as is, meaning these items will land in the output
|
|
|
|
# target files package exactly as they appear in the input partial vendor target
|
2019-02-02 00:52:10 +01:00
|
|
|
# files package.
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
DEFAULT_VENDOR_ITEM_LIST = (
|
2019-02-02 00:52:10 +01:00
|
|
|
'META/boot_filesystem_config.txt',
|
|
|
|
'META/otakeys.txt',
|
|
|
|
'META/releasetools.py',
|
|
|
|
'META/vendor_filesystem_config.txt',
|
|
|
|
'META/vendor_manifest.xml',
|
|
|
|
'META/vendor_matrix.xml',
|
|
|
|
'BOOT/*',
|
|
|
|
'DATA/*',
|
|
|
|
'ODM/*',
|
|
|
|
'OTA/android-info.txt',
|
|
|
|
'PREBUILT_IMAGES/*',
|
|
|
|
'RADIO/*',
|
|
|
|
'VENDOR/*',
|
2019-05-22 19:47:08 +02:00
|
|
|
)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# VENDOR_EXTRACT_SPECIAL_ITEM_LIST is a list of items to extract from the
|
|
|
|
# partial vendor target files package that need some special processing, such as
|
|
|
|
# some sort of combination with items from the partial framework target files
|
2019-02-02 00:52:10 +01:00
|
|
|
# package.
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
VENDOR_EXTRACT_SPECIAL_ITEM_LIST = ('META/*',)
|
2019-05-22 19:47:08 +02:00
|
|
|
|
|
|
|
# The merge config lists should not attempt to extract items from both
|
|
|
|
# builds for any of the following partitions. The partitions in
|
|
|
|
# SINGLE_BUILD_PARTITIONS should come entirely from a single build (either
|
2019-06-06 00:13:43 +02:00
|
|
|
# framework or vendor, but not both).
|
2019-05-22 19:47:08 +02:00
|
|
|
|
|
|
|
SINGLE_BUILD_PARTITIONS = (
|
|
|
|
'BOOT/',
|
|
|
|
'DATA/',
|
|
|
|
'ODM/',
|
|
|
|
'PRODUCT/',
|
2019-06-25 08:58:13 +02:00
|
|
|
'SYSTEM_EXT/',
|
2019-05-22 19:47:08 +02:00
|
|
|
'RADIO/',
|
|
|
|
'RECOVERY/',
|
|
|
|
'ROOT/',
|
|
|
|
'SYSTEM/',
|
|
|
|
'SYSTEM_OTHER/',
|
|
|
|
'VENDOR/',
|
|
|
|
)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
|
2019-05-02 21:42:09 +02:00
|
|
|
def write_sorted_data(data, path):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Writes the sorted contents of either a list or dict to file.
|
2019-05-02 21:42:09 +02:00
|
|
|
|
2019-06-28 01:52:12 +02:00
|
|
|
This function sorts the contents of the list or dict and then writes the
|
|
|
|
resulting sorted contents to a file specified by path.
|
2019-05-02 21:42:09 +02:00
|
|
|
|
|
|
|
Args:
|
|
|
|
data: The list or dict to sort and write.
|
|
|
|
path: Path to the file to write the sorted values to. The file at path will
|
|
|
|
be overridden if it exists.
|
|
|
|
"""
|
|
|
|
with open(path, 'w') as output:
|
2019-06-06 00:13:43 +02:00
|
|
|
for entry in sorted(data):
|
2019-05-02 21:42:09 +02:00
|
|
|
out_str = '{}={}\n'.format(entry, data[entry]) if isinstance(
|
|
|
|
data, dict) else '{}\n'.format(entry)
|
|
|
|
output.write(out_str)
|
|
|
|
|
|
|
|
|
2019-02-02 00:52:10 +01:00
|
|
|
def extract_items(target_files, target_files_temp_dir, extract_item_list):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Extracts items from target files to temporary directory.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
This function extracts from the specified target files zip archive into the
|
|
|
|
specified temporary directory, the items specified in the extract item list.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
target_files: The target files zip archive from which to extract items.
|
|
|
|
target_files_temp_dir: The temporary directory where the extracted items
|
2019-04-17 23:54:06 +02:00
|
|
|
will land.
|
2019-02-02 00:52:10 +01:00
|
|
|
extract_item_list: A list of items to extract.
|
|
|
|
"""
|
|
|
|
|
|
|
|
logger.info('extracting from %s', target_files)
|
|
|
|
|
|
|
|
# Filter the extract_item_list to remove any items that do not exist in the
|
|
|
|
# zip file. Otherwise, the extraction step will fail.
|
|
|
|
|
2019-07-18 19:11:07 +02:00
|
|
|
with zipfile.ZipFile(target_files, allowZip64=True) as target_files_zipfile:
|
2019-02-02 00:52:10 +01:00
|
|
|
target_files_namelist = target_files_zipfile.namelist()
|
|
|
|
|
|
|
|
filtered_extract_item_list = []
|
|
|
|
for pattern in extract_item_list:
|
|
|
|
matching_namelist = fnmatch.filter(target_files_namelist, pattern)
|
|
|
|
if not matching_namelist:
|
|
|
|
logger.warning('no match for %s', pattern)
|
|
|
|
else:
|
|
|
|
filtered_extract_item_list.append(pattern)
|
|
|
|
|
2019-02-22 19:57:43 +01:00
|
|
|
# Extract from target_files into target_files_temp_dir the
|
|
|
|
# filtered_extract_item_list.
|
|
|
|
|
2019-04-17 23:54:06 +02:00
|
|
|
common.UnzipToDir(target_files, target_files_temp_dir,
|
|
|
|
filtered_extract_item_list)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
|
2019-04-15 18:47:24 +02:00
|
|
|
def copy_items(from_dir, to_dir, patterns):
|
|
|
|
"""Similar to extract_items() except uses an input dir instead of zip."""
|
|
|
|
file_paths = []
|
|
|
|
for dirpath, _, filenames in os.walk(from_dir):
|
2019-04-17 23:54:06 +02:00
|
|
|
file_paths.extend(
|
|
|
|
os.path.relpath(path=os.path.join(dirpath, filename), start=from_dir)
|
|
|
|
for filename in filenames)
|
2019-04-15 18:47:24 +02:00
|
|
|
|
|
|
|
filtered_file_paths = set()
|
|
|
|
for pattern in patterns:
|
|
|
|
filtered_file_paths.update(fnmatch.filter(file_paths, pattern))
|
|
|
|
|
|
|
|
for file_path in filtered_file_paths:
|
|
|
|
original_file_path = os.path.join(from_dir, file_path)
|
|
|
|
copied_file_path = os.path.join(to_dir, file_path)
|
|
|
|
copied_file_dir = os.path.dirname(copied_file_path)
|
|
|
|
if not os.path.exists(copied_file_dir):
|
|
|
|
os.makedirs(copied_file_dir)
|
|
|
|
if os.path.islink(original_file_path):
|
|
|
|
os.symlink(os.readlink(original_file_path), copied_file_path)
|
|
|
|
else:
|
|
|
|
shutil.copyfile(original_file_path, copied_file_path)
|
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def validate_config_lists(framework_item_list, framework_misc_info_keys,
|
|
|
|
vendor_item_list):
|
2019-03-19 18:32:03 +01:00
|
|
|
"""Performs validations on the merge config lists.
|
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_item_list: The list of items to extract from the partial framework
|
|
|
|
target files package as is.
|
|
|
|
framework_misc_info_keys: A list of keys to obtain from the framework
|
|
|
|
instance of META/misc_info.txt. The remaining keys from the vendor
|
|
|
|
instance.
|
|
|
|
vendor_item_list: The list of items to extract from the partial vendor
|
2019-04-17 23:54:06 +02:00
|
|
|
target files package as is.
|
2019-03-19 18:32:03 +01:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
False if a validation fails, otherwise true.
|
|
|
|
"""
|
2019-05-22 19:47:08 +02:00
|
|
|
has_error = False
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
default_combined_item_set = set(DEFAULT_FRAMEWORK_ITEM_LIST)
|
|
|
|
default_combined_item_set.update(DEFAULT_VENDOR_ITEM_LIST)
|
2019-03-19 18:32:03 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
combined_item_set = set(framework_item_list)
|
|
|
|
combined_item_set.update(vendor_item_list)
|
2019-03-19 18:32:03 +01:00
|
|
|
|
|
|
|
# Check that the merge config lists are not missing any item specified
|
|
|
|
# by the default config lists.
|
|
|
|
difference = default_combined_item_set.difference(combined_item_set)
|
|
|
|
if difference:
|
2019-04-17 23:54:06 +02:00
|
|
|
logger.error('Missing merge config items: %s', list(difference))
|
2019-03-19 18:32:03 +01:00
|
|
|
logger.error('Please ensure missing items are in either the '
|
2019-06-06 00:13:43 +02:00
|
|
|
'framework-item-list or vendor-item-list files provided to '
|
2019-03-19 18:32:03 +01:00
|
|
|
'this script.')
|
2019-05-22 19:47:08 +02:00
|
|
|
has_error = True
|
|
|
|
|
|
|
|
for partition in SINGLE_BUILD_PARTITIONS:
|
2019-06-06 00:13:43 +02:00
|
|
|
in_framework = any(
|
|
|
|
item.startswith(partition) for item in framework_item_list)
|
|
|
|
in_vendor = any(item.startswith(partition) for item in vendor_item_list)
|
|
|
|
if in_framework and in_vendor:
|
2019-05-22 19:47:08 +02:00
|
|
|
logger.error(
|
2019-06-28 01:52:12 +02:00
|
|
|
'Cannot extract items from %s for both the framework and vendor'
|
2019-06-25 10:09:55 +02:00
|
|
|
' builds. Please ensure only one merge config item list'
|
2019-06-28 01:52:12 +02:00
|
|
|
' includes %s.', partition, partition)
|
2019-05-22 19:47:08 +02:00
|
|
|
has_error = True
|
2019-03-19 18:32:03 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
if ('dynamic_partition_list' in framework_misc_info_keys) or (
|
|
|
|
'super_partition_groups' in framework_misc_info_keys):
|
2019-03-19 22:48:02 +01:00
|
|
|
logger.error('Dynamic partition misc info keys should come from '
|
2019-06-06 00:13:43 +02:00
|
|
|
'the vendor instance of META/misc_info.txt.')
|
2019-05-22 19:47:08 +02:00
|
|
|
has_error = True
|
2019-03-19 22:48:02 +01:00
|
|
|
|
2019-05-22 19:47:08 +02:00
|
|
|
return not has_error
|
2019-03-19 18:32:03 +01:00
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def process_ab_partitions_txt(framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir,
|
2019-04-17 23:54:06 +02:00
|
|
|
output_target_files_temp_dir):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special processing for META/ab_partitions.txt.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 01:52:12 +02:00
|
|
|
This function merges the contents of the META/ab_partitions.txt files from the
|
|
|
|
framework directory and the vendor directory, placing the merged result in the
|
|
|
|
output directory. The precondition in that the files are already extracted.
|
|
|
|
The post condition is that the output META/ab_partitions.txt contains the
|
|
|
|
merged content. The format for each ab_partitions.txt a one partition name per
|
|
|
|
line. The output file contains the union of the parition names.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir: The name of a directory containing the
|
|
|
|
special items extracted from the framework target files package.
|
|
|
|
vendor_target_files_temp_dir: The name of a directory containing the special
|
|
|
|
items extracted from the vendor target files package.
|
2019-04-17 23:54:06 +02:00
|
|
|
output_target_files_temp_dir: The name of a directory that will be used to
|
|
|
|
create the output target files package after all the special cases are
|
|
|
|
processed.
|
2019-02-02 00:52:10 +01:00
|
|
|
"""
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_ab_partitions_txt = os.path.join(framework_target_files_temp_dir,
|
|
|
|
'META', 'ab_partitions.txt')
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
vendor_ab_partitions_txt = os.path.join(vendor_target_files_temp_dir, 'META',
|
|
|
|
'ab_partitions.txt')
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
with open(framework_ab_partitions_txt) as f:
|
|
|
|
framework_ab_partitions = f.read().splitlines()
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
with open(vendor_ab_partitions_txt) as f:
|
|
|
|
vendor_ab_partitions = f.read().splitlines()
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
output_ab_partitions = set(framework_ab_partitions + vendor_ab_partitions)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-04-17 23:54:06 +02:00
|
|
|
output_ab_partitions_txt = os.path.join(output_target_files_temp_dir, 'META',
|
|
|
|
'ab_partitions.txt')
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-05-02 21:42:09 +02:00
|
|
|
write_sorted_data(data=output_ab_partitions, path=output_ab_partitions_txt)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
|
2019-03-30 02:27:23 +01:00
|
|
|
def append_recovery_to_filesystem_config(output_target_files_temp_dir):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special processing for META/filesystem_config.txt.
|
2019-03-30 02:27:23 +01:00
|
|
|
|
2019-06-28 01:52:12 +02:00
|
|
|
This function appends recovery information to META/filesystem_config.txt so
|
|
|
|
that recovery patch regeneration will succeed.
|
2019-03-30 02:27:23 +01:00
|
|
|
|
|
|
|
Args:
|
2019-04-17 23:54:06 +02:00
|
|
|
output_target_files_temp_dir: The name of a directory that will be used to
|
|
|
|
create the output target files package after all the special cases are
|
|
|
|
processed. We find filesystem_config.txt here.
|
2019-03-30 02:27:23 +01:00
|
|
|
"""
|
|
|
|
|
2019-04-17 23:54:06 +02:00
|
|
|
filesystem_config_txt = os.path.join(output_target_files_temp_dir, 'META',
|
|
|
|
'filesystem_config.txt')
|
2019-03-30 02:27:23 +01:00
|
|
|
|
|
|
|
with open(filesystem_config_txt, 'a') as f:
|
|
|
|
# TODO(bpeckham) this data is hard coded. It should be generated
|
|
|
|
# programmatically.
|
2019-04-17 23:54:06 +02:00
|
|
|
f.write('system/bin/install-recovery.sh 0 0 750 '
|
|
|
|
'selabel=u:object_r:install_recovery_exec:s0 capabilities=0x0\n')
|
|
|
|
f.write('system/recovery-from-boot.p 0 0 644 '
|
|
|
|
'selabel=u:object_r:system_file:s0 capabilities=0x0\n')
|
|
|
|
f.write('system/etc/recovery.img 0 0 440 '
|
|
|
|
'selabel=u:object_r:install_recovery_exec:s0 capabilities=0x0\n')
|
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def merge_dynamic_partition_info_dicts(framework_dict,
|
|
|
|
vendor_dict,
|
2019-05-03 23:19:13 +02:00
|
|
|
include_dynamic_partition_list=True,
|
|
|
|
size_prefix='',
|
|
|
|
size_suffix='',
|
|
|
|
list_prefix='',
|
|
|
|
list_suffix=''):
|
|
|
|
"""Merges dynamic partition info variables.
|
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_dict: The dictionary of dynamic partition info variables from the
|
|
|
|
partial framework target files.
|
|
|
|
vendor_dict: The dictionary of dynamic partition info variables from the
|
|
|
|
partial vendor target files.
|
2019-05-03 23:19:13 +02:00
|
|
|
include_dynamic_partition_list: If true, merges the dynamic_partition_list
|
|
|
|
variable. Not all use cases need this variable merged.
|
|
|
|
size_prefix: The prefix in partition group size variables that precedes the
|
|
|
|
name of the partition group. For example, partition group 'group_a' with
|
|
|
|
corresponding size variable 'super_group_a_group_size' would have the
|
|
|
|
size_prefix 'super_'.
|
|
|
|
size_suffix: Similar to size_prefix but for the variable's suffix. For
|
|
|
|
example, 'super_group_a_group_size' would have size_suffix '_group_size'.
|
|
|
|
list_prefix: Similar to size_prefix but for the partition group's
|
|
|
|
partition_list variable.
|
|
|
|
list_suffix: Similar to size_suffix but for the partition group's
|
|
|
|
partition_list variable.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
The merged dynamic partition info dictionary.
|
|
|
|
"""
|
|
|
|
merged_dict = {}
|
2019-06-06 00:13:43 +02:00
|
|
|
# Partition groups and group sizes are defined by the vendor dict because
|
|
|
|
# these values may vary for each board that uses a shared system image.
|
|
|
|
merged_dict['super_partition_groups'] = vendor_dict['super_partition_groups']
|
2019-05-03 23:19:13 +02:00
|
|
|
if include_dynamic_partition_list:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_dynamic_partition_list = framework_dict.get(
|
|
|
|
'dynamic_partition_list', '')
|
|
|
|
vendor_dynamic_partition_list = vendor_dict.get('dynamic_partition_list',
|
2019-05-03 23:19:13 +02:00
|
|
|
'')
|
|
|
|
merged_dict['dynamic_partition_list'] = (
|
2019-06-06 00:13:43 +02:00
|
|
|
'%s %s' % (framework_dynamic_partition_list,
|
|
|
|
vendor_dynamic_partition_list)).strip()
|
2019-05-03 23:19:13 +02:00
|
|
|
for partition_group in merged_dict['super_partition_groups'].split(' '):
|
2019-06-06 00:13:43 +02:00
|
|
|
# Set the partition group's size using the value from the vendor dict.
|
2019-05-03 23:19:13 +02:00
|
|
|
key = '%s%s%s' % (size_prefix, partition_group, size_suffix)
|
2019-06-06 00:13:43 +02:00
|
|
|
if key not in vendor_dict:
|
|
|
|
raise ValueError('Vendor dict does not contain required key %s.' % key)
|
|
|
|
merged_dict[key] = vendor_dict[key]
|
2019-05-03 23:19:13 +02:00
|
|
|
|
|
|
|
# Set the partition group's partition list using a concatenation of the
|
2019-06-06 00:13:43 +02:00
|
|
|
# framework and vendor partition lists.
|
2019-05-03 23:19:13 +02:00
|
|
|
key = '%s%s%s' % (list_prefix, partition_group, list_suffix)
|
|
|
|
merged_dict[key] = (
|
2019-06-06 00:13:43 +02:00
|
|
|
'%s %s' %
|
|
|
|
(framework_dict.get(key, ''), vendor_dict.get(key, ''))).strip()
|
2019-05-03 23:19:13 +02:00
|
|
|
return merged_dict
|
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def process_misc_info_txt(framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir,
|
|
|
|
output_target_files_temp_dir,
|
|
|
|
framework_misc_info_keys):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special processing for META/misc_info.txt.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
This function merges the contents of the META/misc_info.txt files from the
|
2019-06-06 00:13:43 +02:00
|
|
|
framework directory and the vendor directory, placing the merged result in the
|
2019-02-02 00:52:10 +01:00
|
|
|
output directory. The precondition in that the files are already extracted.
|
|
|
|
The post condition is that the output META/misc_info.txt contains the merged
|
|
|
|
content.
|
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir: The name of a directory containing the
|
|
|
|
special items extracted from the framework target files package.
|
|
|
|
vendor_target_files_temp_dir: The name of a directory containing the special
|
|
|
|
items extracted from the vendor target files package.
|
2019-04-17 23:54:06 +02:00
|
|
|
output_target_files_temp_dir: The name of a directory that will be used to
|
|
|
|
create the output target files package after all the special cases are
|
|
|
|
processed.
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_misc_info_keys: A list of keys to obtain from the framework
|
|
|
|
instance of META/misc_info.txt. The remaining keys from the vendor
|
|
|
|
instance.
|
2019-02-02 00:52:10 +01:00
|
|
|
"""
|
|
|
|
|
2019-06-25 10:09:55 +02:00
|
|
|
misc_info_path = ['META', 'misc_info.txt']
|
|
|
|
framework_dict = common.LoadDictionaryFromFile(
|
|
|
|
os.path.join(framework_target_files_temp_dir, *misc_info_path))
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# We take most of the misc info from the vendor target files.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-25 10:09:55 +02:00
|
|
|
merged_dict = common.LoadDictionaryFromFile(
|
|
|
|
os.path.join(vendor_target_files_temp_dir, *misc_info_path))
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Replace certain values in merged_dict with values from
|
|
|
|
# framework_dict.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
for key in framework_misc_info_keys:
|
|
|
|
merged_dict[key] = framework_dict[key]
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-03-19 22:48:02 +01:00
|
|
|
# Merge misc info keys used for Dynamic Partitions.
|
2019-06-06 00:13:43 +02:00
|
|
|
if (merged_dict.get('use_dynamic_partitions') == 'true') and (
|
|
|
|
framework_dict.get('use_dynamic_partitions') == 'true'):
|
2019-05-03 23:19:13 +02:00
|
|
|
merged_dynamic_partitions_dict = merge_dynamic_partition_info_dicts(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_dict=framework_dict,
|
|
|
|
vendor_dict=merged_dict,
|
2019-05-03 23:19:13 +02:00
|
|
|
size_prefix='super_',
|
|
|
|
size_suffix='_group_size',
|
|
|
|
list_prefix='super_',
|
|
|
|
list_suffix='_partition_list')
|
2019-06-06 00:13:43 +02:00
|
|
|
merged_dict.update(merged_dynamic_partitions_dict)
|
2019-06-28 20:00:05 +02:00
|
|
|
# Ensure that add_img_to_target_files rebuilds super split images for
|
|
|
|
# devices that retrofit dynamic partitions. This flag may have been set to
|
|
|
|
# false in the partial builds to prevent duplicate building of super.img.
|
2019-06-10 21:50:19 +02:00
|
|
|
merged_dict['build_super_partition'] = 'true'
|
2019-03-19 22:48:02 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Replace <image>_selinux_fc values with framework or vendor file_contexts.bin
|
2019-05-14 00:58:14 +02:00
|
|
|
# depending on which dictionary the key came from.
|
|
|
|
# Only the file basename is required because all selinux_fc properties are
|
|
|
|
# replaced with the full path to the file under META/ when misc_info.txt is
|
|
|
|
# loaded from target files for repacking. See common.py LoadInfoDict().
|
2019-06-06 00:13:43 +02:00
|
|
|
for key in merged_dict:
|
2019-05-14 00:58:14 +02:00
|
|
|
if key.endswith('_selinux_fc'):
|
2019-06-06 00:13:43 +02:00
|
|
|
merged_dict[key] = 'vendor_file_contexts.bin'
|
|
|
|
for key in framework_dict:
|
2019-05-14 00:58:14 +02:00
|
|
|
if key.endswith('_selinux_fc'):
|
2019-06-06 00:13:43 +02:00
|
|
|
merged_dict[key] = 'framework_file_contexts.bin'
|
2019-05-14 00:58:14 +02:00
|
|
|
|
2019-04-17 23:54:06 +02:00
|
|
|
output_misc_info_txt = os.path.join(output_target_files_temp_dir, 'META',
|
|
|
|
'misc_info.txt')
|
2019-06-06 00:13:43 +02:00
|
|
|
write_sorted_data(data=merged_dict, path=output_misc_info_txt)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def process_dynamic_partitions_info_txt(framework_target_files_dir,
|
|
|
|
vendor_target_files_dir,
|
2019-05-03 23:19:13 +02:00
|
|
|
output_target_files_dir):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special processing for META/dynamic_partitions_info.txt.
|
2019-05-03 23:19:13 +02:00
|
|
|
|
|
|
|
This function merges the contents of the META/dynamic_partitions_info.txt
|
2019-06-06 00:13:43 +02:00
|
|
|
files from the framework directory and the vendor directory, placing the
|
|
|
|
merged result in the output directory.
|
2019-05-03 23:19:13 +02:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
This function does nothing if META/dynamic_partitions_info.txt from the vendor
|
2019-05-03 23:19:13 +02:00
|
|
|
directory does not exist.
|
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir: The name of a directory containing the special
|
|
|
|
items extracted from the framework target files package.
|
|
|
|
vendor_target_files_dir: The name of a directory containing the special
|
|
|
|
items extracted from the vendor target files package.
|
2019-05-03 23:19:13 +02:00
|
|
|
output_target_files_dir: The name of a directory that will be used to create
|
|
|
|
the output target files package after all the special cases are processed.
|
|
|
|
"""
|
|
|
|
|
|
|
|
if not os.path.exists(
|
2019-06-06 00:13:43 +02:00
|
|
|
os.path.join(vendor_target_files_dir, 'META',
|
2019-05-03 23:19:13 +02:00
|
|
|
'dynamic_partitions_info.txt')):
|
|
|
|
return
|
|
|
|
|
2019-06-25 10:09:55 +02:00
|
|
|
dynamic_partitions_info_path = ['META', 'dynamic_partitions_info.txt']
|
2019-05-03 23:19:13 +02:00
|
|
|
|
2019-06-25 10:09:55 +02:00
|
|
|
framework_dynamic_partitions_dict = common.LoadDictionaryFromFile(
|
|
|
|
os.path.join(framework_target_files_dir, *dynamic_partitions_info_path))
|
|
|
|
vendor_dynamic_partitions_dict = common.LoadDictionaryFromFile(
|
|
|
|
os.path.join(vendor_target_files_dir, *dynamic_partitions_info_path))
|
2019-05-03 23:19:13 +02:00
|
|
|
|
|
|
|
merged_dynamic_partitions_dict = merge_dynamic_partition_info_dicts(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_dict=framework_dynamic_partitions_dict,
|
|
|
|
vendor_dict=vendor_dynamic_partitions_dict,
|
2019-05-03 23:19:13 +02:00
|
|
|
# META/dynamic_partitions_info.txt does not use dynamic_partition_list.
|
|
|
|
include_dynamic_partition_list=False,
|
|
|
|
size_suffix='_size',
|
|
|
|
list_suffix='_partition_list')
|
|
|
|
|
|
|
|
output_dynamic_partitions_info_txt = os.path.join(
|
|
|
|
output_target_files_dir, 'META', 'dynamic_partitions_info.txt')
|
2019-05-02 21:42:09 +02:00
|
|
|
write_sorted_data(
|
|
|
|
data=merged_dynamic_partitions_dict,
|
|
|
|
path=output_dynamic_partitions_info_txt)
|
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def process_apex_keys_apk_certs_common(framework_target_files_dir,
|
|
|
|
vendor_target_files_dir,
|
2019-05-02 21:42:09 +02:00
|
|
|
output_target_files_dir, file_name):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special processing for META/apexkeys.txt or META/apkcerts.txt.
|
2019-05-02 21:42:09 +02:00
|
|
|
|
|
|
|
This function merges the contents of the META/apexkeys.txt or
|
2019-06-28 01:52:12 +02:00
|
|
|
META/apkcerts.txt files from the framework directory and the vendor directory,
|
|
|
|
placing the merged result in the output directory. The precondition in that
|
|
|
|
the files are already extracted. The post condition is that the output
|
|
|
|
META/apexkeys.txt or META/apkcerts.txt contains the merged content.
|
2019-05-02 21:42:09 +02:00
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir: The name of a directory containing the special
|
|
|
|
items extracted from the framework target files package.
|
|
|
|
vendor_target_files_dir: The name of a directory containing the special
|
|
|
|
items extracted from the vendor target files package.
|
2019-05-02 21:42:09 +02:00
|
|
|
output_target_files_dir: The name of a directory that will be used to create
|
|
|
|
the output target files package after all the special cases are processed.
|
|
|
|
file_name: The name of the file to merge. One of apkcerts.txt or
|
|
|
|
apexkeys.txt.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def read_helper(d):
|
|
|
|
temp = {}
|
|
|
|
file_path = os.path.join(d, 'META', file_name)
|
|
|
|
with open(file_path) as f:
|
|
|
|
for line in f:
|
|
|
|
if line.strip():
|
|
|
|
temp[line.split()[0]] = line.strip()
|
|
|
|
return temp
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_dict = read_helper(framework_target_files_dir)
|
|
|
|
vendor_dict = read_helper(vendor_target_files_dir)
|
2019-05-02 21:42:09 +02:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
for key in framework_dict:
|
|
|
|
if key in vendor_dict and vendor_dict[key] != framework_dict[key]:
|
2019-05-02 21:42:09 +02:00
|
|
|
raise ValueError('Conflicting entries found in %s:\n %s and\n %s' %
|
2019-06-06 00:13:43 +02:00
|
|
|
(file_name, framework_dict[key], vendor_dict[key]))
|
|
|
|
vendor_dict[key] = framework_dict[key]
|
2019-05-02 21:42:09 +02:00
|
|
|
|
|
|
|
output_file = os.path.join(output_target_files_dir, 'META', file_name)
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
write_sorted_data(data=vendor_dict.values(), path=output_file)
|
2019-05-03 23:19:13 +02:00
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def copy_file_contexts(framework_target_files_dir, vendor_target_files_dir,
|
2019-05-14 00:58:14 +02:00
|
|
|
output_target_files_dir):
|
|
|
|
"""Creates named copies of each build's file_contexts.bin in output META/."""
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_fc_path = os.path.join(framework_target_files_dir, 'META',
|
|
|
|
'framework_file_contexts.bin')
|
|
|
|
if not os.path.exists(framework_fc_path):
|
|
|
|
framework_fc_path = os.path.join(framework_target_files_dir, 'META',
|
|
|
|
'file_contexts.bin')
|
|
|
|
if not os.path.exists(framework_fc_path):
|
|
|
|
raise ValueError('Missing framework file_contexts.bin.')
|
2019-05-14 00:58:14 +02:00
|
|
|
shutil.copyfile(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_fc_path,
|
|
|
|
os.path.join(output_target_files_dir, 'META',
|
|
|
|
'framework_file_contexts.bin'))
|
|
|
|
|
|
|
|
vendor_fc_path = os.path.join(vendor_target_files_dir, 'META',
|
|
|
|
'vendor_file_contexts.bin')
|
|
|
|
if not os.path.exists(vendor_fc_path):
|
|
|
|
vendor_fc_path = os.path.join(vendor_target_files_dir, 'META',
|
|
|
|
'file_contexts.bin')
|
|
|
|
if not os.path.exists(vendor_fc_path):
|
|
|
|
raise ValueError('Missing vendor file_contexts.bin.')
|
2019-05-14 00:58:14 +02:00
|
|
|
shutil.copyfile(
|
2019-06-06 00:13:43 +02:00
|
|
|
vendor_fc_path,
|
|
|
|
os.path.join(output_target_files_dir, 'META', 'vendor_file_contexts.bin'))
|
2019-05-14 00:58:14 +02:00
|
|
|
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
def process_special_cases(framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir,
|
|
|
|
output_target_files_temp_dir,
|
|
|
|
framework_misc_info_keys, rebuild_recovery):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Performs special-case processing for certain target files items.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
Certain files in the output target files package require special-case
|
|
|
|
processing. This function performs all that special-case processing.
|
|
|
|
|
|
|
|
Args:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir: The name of a directory containing the
|
|
|
|
special items extracted from the framework target files package.
|
|
|
|
vendor_target_files_temp_dir: The name of a directory containing the special
|
|
|
|
items extracted from the vendor target files package.
|
2019-04-17 23:54:06 +02:00
|
|
|
output_target_files_temp_dir: The name of a directory that will be used to
|
|
|
|
create the output target files package after all the special cases are
|
|
|
|
processed.
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_misc_info_keys: A list of keys to obtain from the framework
|
|
|
|
instance of META/misc_info.txt. The remaining keys from the vendor
|
|
|
|
instance.
|
2019-03-30 02:27:23 +01:00
|
|
|
rebuild_recovery: If true, rebuild the recovery patch used by non-A/B
|
2019-04-17 23:54:06 +02:00
|
|
|
devices and write it to the system image.
|
2019-02-02 00:52:10 +01:00
|
|
|
"""
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
if 'ab_update' in framework_misc_info_keys:
|
2019-03-30 02:27:23 +01:00
|
|
|
process_ab_partitions_txt(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir=vendor_target_files_temp_dir,
|
2019-03-30 02:27:23 +01:00
|
|
|
output_target_files_temp_dir=output_target_files_temp_dir)
|
|
|
|
|
|
|
|
if rebuild_recovery:
|
|
|
|
append_recovery_to_filesystem_config(
|
|
|
|
output_target_files_temp_dir=output_target_files_temp_dir)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-05-14 00:58:14 +02:00
|
|
|
copy_file_contexts(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_dir=vendor_target_files_temp_dir,
|
2019-05-14 00:58:14 +02:00
|
|
|
output_target_files_dir=output_target_files_temp_dir)
|
|
|
|
|
2019-02-02 00:52:10 +01:00
|
|
|
process_misc_info_txt(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir=vendor_target_files_temp_dir,
|
2019-03-07 22:01:48 +01:00
|
|
|
output_target_files_temp_dir=output_target_files_temp_dir,
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_misc_info_keys=framework_misc_info_keys)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-05-03 23:19:13 +02:00
|
|
|
process_dynamic_partitions_info_txt(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_dir=vendor_target_files_temp_dir,
|
2019-05-09 01:20:02 +02:00
|
|
|
output_target_files_dir=output_target_files_temp_dir)
|
2019-05-03 23:19:13 +02:00
|
|
|
|
2019-05-02 21:42:09 +02:00
|
|
|
process_apex_keys_apk_certs_common(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_dir=vendor_target_files_temp_dir,
|
2019-05-02 21:42:09 +02:00
|
|
|
output_target_files_dir=output_target_files_temp_dir,
|
|
|
|
file_name='apkcerts.txt')
|
|
|
|
|
|
|
|
process_apex_keys_apk_certs_common(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_dir=vendor_target_files_temp_dir,
|
2019-05-02 21:42:09 +02:00
|
|
|
output_target_files_dir=output_target_files_temp_dir,
|
|
|
|
file_name='apexkeys.txt')
|
|
|
|
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
def files_from_path(target_path, extra_args=None):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Gets files under given path.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
Get (sub)files from given target path and return sorted list.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
target_path: Target path to get subfiles.
|
|
|
|
extra_args: List of extra argument for find command. Optional.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Sorted files and directories list.
|
|
|
|
"""
|
|
|
|
|
|
|
|
find_command = ['find', target_path] + (extra_args or [])
|
|
|
|
find_process = common.Run(find_command, stdout=subprocess.PIPE, verbose=False)
|
2019-07-18 19:11:07 +02:00
|
|
|
return common.RunAndCheckOutput(['sort'],
|
|
|
|
stdin=find_process.stdout,
|
2019-06-28 06:26:04 +02:00
|
|
|
verbose=False)
|
|
|
|
|
|
|
|
|
|
|
|
def create_merged_package(temp_dir, framework_target_files, framework_item_list,
|
|
|
|
vendor_target_files, vendor_item_list,
|
2019-07-18 19:11:07 +02:00
|
|
|
framework_misc_info_keys, rebuild_recovery):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Merges two target files packages into one target files structure.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
Args:
|
|
|
|
temp_dir: The name of a directory we use when we extract items from the
|
2019-04-17 23:54:06 +02:00
|
|
|
input target files packages, and also a scratch directory that we use for
|
|
|
|
temporary files.
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files: The name of the zip archive containing the framework
|
2019-04-17 23:54:06 +02:00
|
|
|
partial target files package.
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_item_list: The list of items to extract from the partial framework
|
2019-04-17 23:54:06 +02:00
|
|
|
target files package as is, meaning these items will land in the output
|
2019-06-06 00:13:43 +02:00
|
|
|
target files package exactly as they appear in the input partial framework
|
2019-04-17 23:54:06 +02:00
|
|
|
target files package.
|
2019-06-06 00:13:43 +02:00
|
|
|
vendor_target_files: The name of the zip archive containing the vendor
|
|
|
|
partial target files package.
|
|
|
|
vendor_item_list: The list of items to extract from the partial vendor
|
|
|
|
target files package as is, meaning these items will land in the output
|
|
|
|
target files package exactly as they appear in the input partial vendor
|
2019-04-17 23:54:06 +02:00
|
|
|
target files package.
|
2019-06-28 06:26:04 +02:00
|
|
|
framework_misc_info_keys: The list of keys to obtain from the framework
|
|
|
|
instance of META/misc_info.txt. The remaining keys from the vendor
|
|
|
|
instance.
|
2019-03-15 22:36:21 +01:00
|
|
|
rebuild_recovery: If true, rebuild the recovery patch used by non-A/B
|
2019-04-17 23:54:06 +02:00
|
|
|
devices and write it to the system image.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
Returns:
|
|
|
|
Path to merged package under temp directory.
|
|
|
|
"""
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Create directory names that we'll use when we extract files from framework,
|
|
|
|
# and vendor, and for zipping the final output.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir = os.path.join(temp_dir, 'framework')
|
|
|
|
vendor_target_files_temp_dir = os.path.join(temp_dir, 'vendor')
|
2019-02-02 00:52:10 +01:00
|
|
|
output_target_files_temp_dir = os.path.join(temp_dir, 'output')
|
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Extract "as is" items from the input framework partial target files package.
|
2019-02-02 00:52:10 +01:00
|
|
|
# We extract them directly into the output temporary directory since the
|
|
|
|
# items do not need special case processing.
|
|
|
|
|
2019-02-22 03:53:37 +01:00
|
|
|
extract_items(
|
2019-06-06 00:13:43 +02:00
|
|
|
target_files=framework_target_files,
|
2019-02-02 00:52:10 +01:00
|
|
|
target_files_temp_dir=output_target_files_temp_dir,
|
2019-06-06 00:13:43 +02:00
|
|
|
extract_item_list=framework_item_list)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Extract "as is" items from the input vendor partial target files package. We
|
2019-02-02 00:52:10 +01:00
|
|
|
# extract them directly into the output temporary directory since the items
|
|
|
|
# do not need special case processing.
|
|
|
|
|
2019-02-22 03:53:37 +01:00
|
|
|
extract_items(
|
2019-06-06 00:13:43 +02:00
|
|
|
target_files=vendor_target_files,
|
2019-02-02 00:52:10 +01:00
|
|
|
target_files_temp_dir=output_target_files_temp_dir,
|
2019-06-06 00:13:43 +02:00
|
|
|
extract_item_list=vendor_item_list)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Extract "special" items from the input framework partial target files
|
|
|
|
# package. We extract these items to different directory since they require
|
|
|
|
# special processing before they will end up in the output directory.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-02-22 03:53:37 +01:00
|
|
|
extract_items(
|
2019-06-06 00:13:43 +02:00
|
|
|
target_files=framework_target_files,
|
|
|
|
target_files_temp_dir=framework_target_files_temp_dir,
|
|
|
|
extract_item_list=FRAMEWORK_EXTRACT_SPECIAL_ITEM_LIST)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
# Extract "special" items from the input vendor partial target files package.
|
2019-02-02 00:52:10 +01:00
|
|
|
# We extract these items to different directory since they require special
|
|
|
|
# processing before they will end up in the output directory.
|
|
|
|
|
2019-02-22 03:53:37 +01:00
|
|
|
extract_items(
|
2019-06-06 00:13:43 +02:00
|
|
|
target_files=vendor_target_files,
|
|
|
|
target_files_temp_dir=vendor_target_files_temp_dir,
|
|
|
|
extract_item_list=VENDOR_EXTRACT_SPECIAL_ITEM_LIST)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
# Now that the temporary directories contain all the extracted files, perform
|
|
|
|
# special case processing on any items that need it. After this function
|
|
|
|
# completes successfully, all the files we need to create the output target
|
|
|
|
# files package are in place.
|
|
|
|
|
2019-02-22 03:53:37 +01:00
|
|
|
process_special_cases(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files_temp_dir=framework_target_files_temp_dir,
|
|
|
|
vendor_target_files_temp_dir=vendor_target_files_temp_dir,
|
2019-03-07 22:01:48 +01:00
|
|
|
output_target_files_temp_dir=output_target_files_temp_dir,
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_misc_info_keys=framework_misc_info_keys,
|
2019-03-30 02:27:23 +01:00
|
|
|
rebuild_recovery=rebuild_recovery)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
return output_target_files_temp_dir
|
|
|
|
|
|
|
|
|
|
|
|
def generate_images(target_files_dir, rebuild_recovery):
|
|
|
|
"""Generate images from target files.
|
|
|
|
|
|
|
|
This function takes merged output temporary directory and create images
|
|
|
|
from it.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
target_files_dir: Path to merged temp directory.
|
|
|
|
rebuild_recovery: If true, rebuild the recovery patch used by non-A/B
|
|
|
|
devices and write it to the system image.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# Regenerate IMAGES in the target directory.
|
2019-04-18 21:32:18 +02:00
|
|
|
|
|
|
|
add_img_args = ['--verbose']
|
|
|
|
if rebuild_recovery:
|
|
|
|
add_img_args.append('--rebuild_recovery')
|
2019-06-28 06:26:04 +02:00
|
|
|
add_img_args.append(target_files_dir)
|
2019-04-18 21:32:18 +02:00
|
|
|
|
|
|
|
add_img_to_target_files.main(add_img_args)
|
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
def generate_super_empty_image(target_dir, output_super_empty):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Generates super_empty image from target package.
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
Args:
|
|
|
|
target_dir: Path to the target file package which contains misc_info.txt for
|
|
|
|
detailed information for super image.
|
|
|
|
output_super_empty: If provided, copies a super_empty.img file from the
|
|
|
|
target files package to this path.
|
|
|
|
"""
|
2019-04-15 20:34:56 +02:00
|
|
|
# Create super_empty.img using the merged misc_info.txt.
|
|
|
|
|
2019-07-18 19:11:07 +02:00
|
|
|
misc_info_txt = os.path.join(target_dir, 'META', 'misc_info.txt')
|
2019-04-17 23:54:06 +02:00
|
|
|
|
2019-06-25 10:09:55 +02:00
|
|
|
use_dynamic_partitions = common.LoadDictionaryFromFile(misc_info_txt).get(
|
|
|
|
'use_dynamic_partitions')
|
2019-04-15 20:34:56 +02:00
|
|
|
|
2019-04-18 21:32:18 +02:00
|
|
|
if use_dynamic_partitions != 'true' and output_super_empty:
|
|
|
|
raise ValueError(
|
|
|
|
'Building super_empty.img requires use_dynamic_partitions=true.')
|
|
|
|
elif use_dynamic_partitions == 'true':
|
2019-07-18 19:11:07 +02:00
|
|
|
super_empty_img = os.path.join(target_dir, 'IMAGES', 'super_empty.img')
|
2019-04-15 20:34:56 +02:00
|
|
|
build_super_image_args = [
|
2019-04-17 23:54:06 +02:00
|
|
|
misc_info_txt,
|
2019-04-18 21:32:18 +02:00
|
|
|
super_empty_img,
|
2019-04-15 20:34:56 +02:00
|
|
|
]
|
|
|
|
build_super_image.main(build_super_image_args)
|
|
|
|
|
2019-04-18 21:32:18 +02:00
|
|
|
# Copy super_empty.img to the user-provided output_super_empty location.
|
|
|
|
if output_super_empty:
|
|
|
|
shutil.copyfile(super_empty_img, output_super_empty)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-04-24 21:55:51 +02:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
def create_target_files_archive(output_file, source_dir, temp_dir):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Creates archive from target package.
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
Args:
|
|
|
|
output_file: The name of the zip archive target files package.
|
|
|
|
source_dir: The target directory contains package to be archived.
|
|
|
|
temp_dir: Path to temporary directory for any intermediate files.
|
|
|
|
"""
|
2019-02-02 00:52:10 +01:00
|
|
|
output_target_files_list = os.path.join(temp_dir, 'output.list')
|
2019-06-28 06:26:04 +02:00
|
|
|
output_zip = os.path.abspath(output_file)
|
2019-07-18 19:11:07 +02:00
|
|
|
output_target_files_meta_dir = os.path.join(source_dir, 'META')
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 06:26:04 +02:00
|
|
|
meta_content = files_from_path(output_target_files_meta_dir)
|
2019-07-18 19:11:07 +02:00
|
|
|
other_content = files_from_path(
|
|
|
|
source_dir,
|
|
|
|
['-path', output_target_files_meta_dir, '-prune', '-o', '-print'])
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-28 01:52:12 +02:00
|
|
|
with open(output_target_files_list, 'w') as f:
|
2019-02-02 00:52:10 +01:00
|
|
|
f.write(meta_content)
|
|
|
|
f.write(other_content)
|
|
|
|
|
|
|
|
command = [
|
2019-02-20 03:02:46 +01:00
|
|
|
'soong_zip',
|
2019-02-02 00:52:10 +01:00
|
|
|
'-d',
|
2019-04-17 23:54:06 +02:00
|
|
|
'-o',
|
|
|
|
output_zip,
|
|
|
|
'-C',
|
2019-06-28 06:26:04 +02:00
|
|
|
source_dir,
|
2019-04-17 23:54:06 +02:00
|
|
|
'-l',
|
|
|
|
output_target_files_list,
|
2019-02-02 00:52:10 +01:00
|
|
|
]
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
logger.info('creating %s', output_file)
|
2019-02-22 03:53:37 +01:00
|
|
|
common.RunAndWait(command, verbose=True)
|
2019-06-28 06:26:04 +02:00
|
|
|
logger.info('finished creating %s', output_file)
|
|
|
|
|
|
|
|
return output_zip
|
|
|
|
|
|
|
|
|
|
|
|
def merge_target_files(temp_dir, framework_target_files, framework_item_list,
|
|
|
|
framework_misc_info_keys, vendor_target_files,
|
|
|
|
vendor_item_list, output_target_files, output_dir,
|
|
|
|
output_item_list, output_ota, output_img,
|
|
|
|
output_super_empty, rebuild_recovery):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Merges two target files packages together.
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
This function takes framework and vendor target files packages as input,
|
|
|
|
performs various file extractions, special case processing, and finally
|
|
|
|
creates a merged zip archive as output.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
temp_dir: The name of a directory we use when we extract items from the
|
|
|
|
input target files packages, and also a scratch directory that we use for
|
|
|
|
temporary files.
|
|
|
|
framework_target_files: The name of the zip archive containing the framework
|
|
|
|
partial target files package.
|
|
|
|
framework_item_list: The list of items to extract from the partial framework
|
|
|
|
target files package as is, meaning these items will land in the output
|
|
|
|
target files package exactly as they appear in the input partial framework
|
|
|
|
target files package.
|
|
|
|
framework_misc_info_keys: The list of keys to obtain from the framework
|
|
|
|
instance of META/misc_info.txt. The remaining keys from the vendor
|
|
|
|
instance.
|
|
|
|
vendor_target_files: The name of the zip archive containing the vendor
|
|
|
|
partial target files package.
|
|
|
|
vendor_item_list: The list of items to extract from the partial vendor
|
|
|
|
target files package as is, meaning these items will land in the output
|
|
|
|
target files package exactly as they appear in the input partial vendor
|
|
|
|
target files package.
|
|
|
|
output_target_files: The name of the output zip archive target files package
|
|
|
|
created by merging framework and vendor.
|
|
|
|
output_dir: The destination directory for saving merged files.
|
|
|
|
output_item_list: The list of items to copy into the output_dir.
|
|
|
|
output_ota: The name of the output zip archive ota package.
|
|
|
|
output_img: The name of the output zip archive img package.
|
|
|
|
output_super_empty: If provided, creates a super_empty.img file from the
|
|
|
|
merged target files package and saves it at this path.
|
|
|
|
rebuild_recovery: If true, rebuild the recovery patch used by non-A/B
|
|
|
|
devices and write it to the system image.
|
|
|
|
"""
|
|
|
|
|
|
|
|
logger.info('starting: merge framework %s and vendor %s into output %s',
|
|
|
|
framework_target_files, vendor_target_files, output_target_files)
|
|
|
|
|
|
|
|
output_target_files_temp_dir = create_merged_package(
|
|
|
|
temp_dir, framework_target_files, framework_item_list,
|
|
|
|
vendor_target_files, vendor_item_list, framework_misc_info_keys,
|
|
|
|
rebuild_recovery)
|
|
|
|
|
|
|
|
generate_images(output_target_files_temp_dir, rebuild_recovery)
|
|
|
|
|
|
|
|
generate_super_empty_image(output_target_files_temp_dir, output_super_empty)
|
|
|
|
|
|
|
|
if output_img:
|
|
|
|
# Create the IMG package from the merged target files (before zipping, in
|
|
|
|
# order to avoid an unnecessary unzip and copy).
|
2019-07-18 19:11:07 +02:00
|
|
|
img_from_target_files.main([output_target_files_temp_dir, output_img])
|
2019-06-28 06:26:04 +02:00
|
|
|
|
|
|
|
# Finally, create the output target files zip archive and/or copy the
|
|
|
|
# output items to the output target files directory.
|
|
|
|
|
|
|
|
if output_dir:
|
|
|
|
copy_items(output_target_files_temp_dir, output_dir, output_item_list)
|
|
|
|
|
|
|
|
if not output_target_files:
|
|
|
|
return
|
|
|
|
|
|
|
|
output_zip = create_target_files_archive(output_target_files,
|
|
|
|
output_target_files_temp_dir,
|
|
|
|
temp_dir)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-04-17 01:11:35 +02:00
|
|
|
# Create the OTA package from the merged target files package.
|
|
|
|
|
|
|
|
if output_ota:
|
2019-07-18 19:11:07 +02:00
|
|
|
ota_from_target_files.main([output_zip, output_ota])
|
2019-04-17 01:11:35 +02:00
|
|
|
|
2019-04-18 21:32:18 +02:00
|
|
|
|
2019-03-07 22:01:48 +01:00
|
|
|
def call_func_with_temp_dir(func, keep_tmp):
|
2019-06-28 01:52:12 +02:00
|
|
|
"""Manages the creation and cleanup of the temporary directory.
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-03-07 22:01:48 +01:00
|
|
|
This function calls the given function after first creating a temporary
|
2019-02-02 00:52:10 +01:00
|
|
|
directory. It also cleans up the temporary directory.
|
|
|
|
|
|
|
|
Args:
|
2019-04-17 23:54:06 +02:00
|
|
|
func: The function to call. Should accept one parameter, the path to the
|
|
|
|
temporary directory.
|
2019-02-02 00:52:10 +01:00
|
|
|
keep_tmp: Keep the temporary directory after processing is complete.
|
|
|
|
"""
|
|
|
|
|
|
|
|
# Create a temporary directory. This will serve as the parent of directories
|
|
|
|
# we use when we extract items from the input target files packages, and also
|
|
|
|
# a scratch directory that we use for temporary files.
|
|
|
|
|
|
|
|
temp_dir = common.MakeTempDir(prefix='merge_target_files_')
|
|
|
|
|
|
|
|
try:
|
2019-03-07 22:01:48 +01:00
|
|
|
func(temp_dir)
|
2019-02-02 00:52:10 +01:00
|
|
|
finally:
|
|
|
|
if keep_tmp:
|
|
|
|
logger.info('keeping %s', temp_dir)
|
|
|
|
else:
|
|
|
|
common.Cleanup()
|
|
|
|
|
|
|
|
|
|
|
|
def main():
|
|
|
|
"""The main function.
|
|
|
|
|
2019-03-07 22:01:48 +01:00
|
|
|
Process command line arguments, then call merge_target_files to
|
2019-02-02 00:52:10 +01:00
|
|
|
perform the heavy lifting.
|
|
|
|
"""
|
|
|
|
|
|
|
|
common.InitLogging()
|
|
|
|
|
2019-02-20 03:02:46 +01:00
|
|
|
def option_handler(o, a):
|
|
|
|
if o == '--system-target-files':
|
2019-06-06 00:13:43 +02:00
|
|
|
logger.warning(
|
|
|
|
'--system-target-files has been renamed to --framework-target-files')
|
|
|
|
OPTIONS.framework_target_files = a
|
|
|
|
elif o == '--framework-target-files':
|
|
|
|
OPTIONS.framework_target_files = a
|
2019-03-07 22:01:48 +01:00
|
|
|
elif o == '--system-item-list':
|
2019-06-06 00:13:43 +02:00
|
|
|
logger.warning(
|
|
|
|
'--system-item-list has been renamed to --framework-item-list')
|
|
|
|
OPTIONS.framework_item_list = a
|
|
|
|
elif o == '--framework-item-list':
|
|
|
|
OPTIONS.framework_item_list = a
|
2019-03-07 22:01:48 +01:00
|
|
|
elif o == '--system-misc-info-keys':
|
2019-07-18 19:11:07 +02:00
|
|
|
logger.warning('--system-misc-info-keys has been renamed to '
|
|
|
|
'--framework-misc-info-keys')
|
2019-06-06 00:13:43 +02:00
|
|
|
OPTIONS.framework_misc_info_keys = a
|
|
|
|
elif o == '--framework-misc-info-keys':
|
|
|
|
OPTIONS.framework_misc_info_keys = a
|
2019-02-20 03:02:46 +01:00
|
|
|
elif o == '--other-target-files':
|
2019-06-06 00:13:43 +02:00
|
|
|
logger.warning(
|
|
|
|
'--other-target-files has been renamed to --vendor-target-files')
|
|
|
|
OPTIONS.vendor_target_files = a
|
|
|
|
elif o == '--vendor-target-files':
|
|
|
|
OPTIONS.vendor_target_files = a
|
2019-03-07 22:01:48 +01:00
|
|
|
elif o == '--other-item-list':
|
2019-06-06 00:13:43 +02:00
|
|
|
logger.warning('--other-item-list has been renamed to --vendor-item-list')
|
|
|
|
OPTIONS.vendor_item_list = a
|
|
|
|
elif o == '--vendor-item-list':
|
|
|
|
OPTIONS.vendor_item_list = a
|
2019-02-20 03:02:46 +01:00
|
|
|
elif o == '--output-target-files':
|
|
|
|
OPTIONS.output_target_files = a
|
2019-04-15 18:47:24 +02:00
|
|
|
elif o == '--output-dir':
|
|
|
|
OPTIONS.output_dir = a
|
|
|
|
elif o == '--output-item-list':
|
|
|
|
OPTIONS.output_item_list = a
|
2019-04-17 01:11:35 +02:00
|
|
|
elif o == '--output-ota':
|
|
|
|
OPTIONS.output_ota = a
|
2019-04-18 21:32:18 +02:00
|
|
|
elif o == '--output-img':
|
|
|
|
OPTIONS.output_img = a
|
2019-04-15 20:34:56 +02:00
|
|
|
elif o == '--output-super-empty':
|
|
|
|
OPTIONS.output_super_empty = a
|
2019-03-15 22:36:21 +01:00
|
|
|
elif o == '--rebuild_recovery':
|
|
|
|
OPTIONS.rebuild_recovery = True
|
2019-03-30 02:27:23 +01:00
|
|
|
elif o == '--keep-tmp':
|
2019-02-20 03:02:46 +01:00
|
|
|
OPTIONS.keep_tmp = True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
return True
|
|
|
|
|
|
|
|
args = common.ParseOptions(
|
2019-04-17 23:54:06 +02:00
|
|
|
sys.argv[1:],
|
|
|
|
__doc__,
|
2019-02-20 03:02:46 +01:00
|
|
|
extra_long_opts=[
|
|
|
|
'system-target-files=',
|
2019-06-06 00:13:43 +02:00
|
|
|
'framework-target-files=',
|
2019-03-07 22:01:48 +01:00
|
|
|
'system-item-list=',
|
2019-06-06 00:13:43 +02:00
|
|
|
'framework-item-list=',
|
2019-03-07 22:01:48 +01:00
|
|
|
'system-misc-info-keys=',
|
2019-06-06 00:13:43 +02:00
|
|
|
'framework-misc-info-keys=',
|
2019-02-20 03:02:46 +01:00
|
|
|
'other-target-files=',
|
2019-06-06 00:13:43 +02:00
|
|
|
'vendor-target-files=',
|
2019-03-07 22:01:48 +01:00
|
|
|
'other-item-list=',
|
2019-06-06 00:13:43 +02:00
|
|
|
'vendor-item-list=',
|
2019-02-20 03:02:46 +01:00
|
|
|
'output-target-files=',
|
2019-04-15 18:47:24 +02:00
|
|
|
'output-dir=',
|
|
|
|
'output-item-list=',
|
2019-04-17 01:11:35 +02:00
|
|
|
'output-ota=',
|
2019-04-18 21:32:18 +02:00
|
|
|
'output-img=',
|
2019-04-15 20:34:56 +02:00
|
|
|
'output-super-empty=',
|
2019-03-15 22:36:21 +01:00
|
|
|
'rebuild_recovery',
|
2019-03-30 02:27:23 +01:00
|
|
|
'keep-tmp',
|
2019-02-20 03:02:46 +01:00
|
|
|
],
|
|
|
|
extra_option_handler=option_handler)
|
|
|
|
|
2019-06-28 01:52:12 +02:00
|
|
|
# pylint: disable=too-many-boolean-expressions
|
2019-06-06 00:13:43 +02:00
|
|
|
if (args or OPTIONS.framework_target_files is None or
|
|
|
|
OPTIONS.vendor_target_files is None or
|
2019-04-17 23:54:06 +02:00
|
|
|
(OPTIONS.output_target_files is None and OPTIONS.output_dir is None) or
|
|
|
|
(OPTIONS.output_dir is not None and OPTIONS.output_item_list is None)):
|
2019-02-20 03:02:46 +01:00
|
|
|
common.Usage(__doc__)
|
2019-02-22 03:53:37 +01:00
|
|
|
sys.exit(1)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
if OPTIONS.framework_item_list:
|
2019-07-18 19:11:07 +02:00
|
|
|
framework_item_list = common.LoadListFromFile(OPTIONS.framework_item_list)
|
2019-03-07 22:01:48 +01:00
|
|
|
else:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_item_list = DEFAULT_FRAMEWORK_ITEM_LIST
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
if OPTIONS.framework_misc_info_keys:
|
2019-07-18 19:11:07 +02:00
|
|
|
framework_misc_info_keys = common.LoadListFromFile(
|
2019-06-06 00:13:43 +02:00
|
|
|
OPTIONS.framework_misc_info_keys)
|
2019-03-07 22:01:48 +01:00
|
|
|
else:
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_misc_info_keys = DEFAULT_FRAMEWORK_MISC_INFO_KEYS
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-06-06 00:13:43 +02:00
|
|
|
if OPTIONS.vendor_item_list:
|
2019-07-18 19:11:07 +02:00
|
|
|
vendor_item_list = common.LoadListFromFile(OPTIONS.vendor_item_list)
|
2019-03-07 22:01:48 +01:00
|
|
|
else:
|
2019-06-06 00:13:43 +02:00
|
|
|
vendor_item_list = DEFAULT_VENDOR_ITEM_LIST
|
2019-03-07 22:01:48 +01:00
|
|
|
|
2019-04-15 18:47:24 +02:00
|
|
|
if OPTIONS.output_item_list:
|
2019-07-18 19:11:07 +02:00
|
|
|
output_item_list = common.LoadListFromFile(OPTIONS.output_item_list)
|
2019-04-15 18:47:24 +02:00
|
|
|
else:
|
|
|
|
output_item_list = None
|
|
|
|
|
2019-03-19 18:32:03 +01:00
|
|
|
if not validate_config_lists(
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_item_list=framework_item_list,
|
|
|
|
framework_misc_info_keys=framework_misc_info_keys,
|
|
|
|
vendor_item_list=vendor_item_list):
|
2019-03-19 18:32:03 +01:00
|
|
|
sys.exit(1)
|
|
|
|
|
2019-03-07 22:01:48 +01:00
|
|
|
call_func_with_temp_dir(
|
|
|
|
lambda temp_dir: merge_target_files(
|
|
|
|
temp_dir=temp_dir,
|
2019-06-06 00:13:43 +02:00
|
|
|
framework_target_files=OPTIONS.framework_target_files,
|
|
|
|
framework_item_list=framework_item_list,
|
|
|
|
framework_misc_info_keys=framework_misc_info_keys,
|
|
|
|
vendor_target_files=OPTIONS.vendor_target_files,
|
|
|
|
vendor_item_list=vendor_item_list,
|
2019-03-15 22:36:21 +01:00
|
|
|
output_target_files=OPTIONS.output_target_files,
|
2019-04-15 18:47:24 +02:00
|
|
|
output_dir=OPTIONS.output_dir,
|
|
|
|
output_item_list=output_item_list,
|
2019-04-17 01:11:35 +02:00
|
|
|
output_ota=OPTIONS.output_ota,
|
2019-04-18 21:32:18 +02:00
|
|
|
output_img=OPTIONS.output_img,
|
2019-04-15 20:34:56 +02:00
|
|
|
output_super_empty=OPTIONS.output_super_empty,
|
2019-04-17 23:54:06 +02:00
|
|
|
rebuild_recovery=OPTIONS.rebuild_recovery), OPTIONS.keep_tmp)
|
2019-02-02 00:52:10 +01:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
2019-02-22 03:53:37 +01:00
|
|
|
main()
|