forked from openkylin/platform_build
Merge "Remove file_contexts.bin from non-A/B OTA package."
This commit is contained in:
commit
7a1ed9edef
|
@ -470,11 +470,6 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
|
||||||
if HasVendorPartition(input_zip):
|
if HasVendorPartition(input_zip):
|
||||||
system_progress -= 0.1
|
system_progress -= 0.1
|
||||||
|
|
||||||
# Place a copy of file_contexts.bin into the OTA package which will be used
|
|
||||||
# by the recovery program.
|
|
||||||
if "selinux_fc" in OPTIONS.info_dict:
|
|
||||||
WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip)
|
|
||||||
|
|
||||||
recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
|
recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options")
|
||||||
|
|
||||||
script.ShowProgress(system_progress, 0)
|
script.ShowProgress(system_progress, 0)
|
||||||
|
@ -540,10 +535,6 @@ endif;
|
||||||
WriteMetadata(metadata, output_zip)
|
WriteMetadata(metadata, output_zip)
|
||||||
|
|
||||||
|
|
||||||
def WritePolicyConfig(file_name, output_zip):
|
|
||||||
common.ZipWrite(output_zip, file_name, os.path.basename(file_name))
|
|
||||||
|
|
||||||
|
|
||||||
def WriteMetadata(metadata, output_zip):
|
def WriteMetadata(metadata, output_zip):
|
||||||
value = "".join(["%s=%s\n" % kv for kv in sorted(metadata.iteritems())])
|
value = "".join(["%s=%s\n" % kv for kv in sorted(metadata.iteritems())])
|
||||||
common.ZipWriteStr(output_zip, METADATA_NAME, value,
|
common.ZipWriteStr(output_zip, METADATA_NAME, value,
|
||||||
|
|
Loading…
Reference in New Issue