a12cd56eda
Currently, an extra '/vendor' is appended in target_files_dir of make_recovery_patch.py, which will yield an erroneous path when attempting to build full recovery image on vendorimage-leas devices: SYSTEM/vendor/vendor/etc/recovery.img This patch addresses the issue by removing the extra '/vendor' of target_files_dir, and add checks for whether the target builds vendor image in MakeRecoveryPatch() as well. This ensures no recovery image will be generated with prebuilt vendor. Signed-off-by: Ricky Cheung <rcheung844@gmail.com> Change-Id: I2dc6e43537deb606dd01fb090add2595502055c1 Signed-off-by: RITEFANG <1721985272@qq.com>
74 lines
2.0 KiB
Python
74 lines
2.0 KiB
Python
#!/usr/bin/env python
|
|
#
|
|
# Copyright (C) 2014 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.
|
|
|
|
from __future__ import print_function
|
|
|
|
import logging
|
|
import os
|
|
import sys
|
|
|
|
import common
|
|
|
|
if sys.hexversion < 0x02070000:
|
|
print("Python 2.7 or newer is required.", file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
OPTIONS = common.OPTIONS
|
|
|
|
|
|
def main(argv):
|
|
args = common.ParseOptions(argv, __doc__)
|
|
input_dir, output_dir = args
|
|
|
|
common.InitLogging()
|
|
|
|
OPTIONS.info_dict = common.LoadInfoDict(input_dir)
|
|
|
|
recovery_img = common.GetBootableImage("recovery.img", "recovery.img",
|
|
input_dir, "RECOVERY")
|
|
boot_img = common.GetBootableImage("boot.img", "boot.img",
|
|
input_dir, "BOOT")
|
|
|
|
if not recovery_img or not boot_img:
|
|
sys.exit(0)
|
|
|
|
board_uses_vendorimage = OPTIONS.info_dict.get(
|
|
"board_uses_vendorimage") == "true"
|
|
board_builds_vendorimage = OPTIONS.info_dict.get(
|
|
"board_builds_vendorimage") == "true"
|
|
target_files_dir = None
|
|
|
|
if board_builds_vendorimage:
|
|
target_files_dir = "VENDOR"
|
|
elif not board_uses_vendorimage:
|
|
target_files_dir = "SYSTEM"
|
|
|
|
def output_sink(fn, data):
|
|
if target_files_dir is None:
|
|
return
|
|
|
|
with open(os.path.join(output_dir, target_files_dir,
|
|
*fn.split("/")), "wb") as f:
|
|
f.write(data)
|
|
|
|
common.MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
main(sys.argv[1:])
|