diff options
author | Andreas Blaesius <skate4life@gmx.de> | 2017-10-13 21:07:12 +0200 |
---|---|---|
committer | Tim Schumacher <timschumi@gmx.de> | 2018-06-19 21:16:12 +0200 |
commit | a465d0356c106fe398f35418a738b4a22324b1bd (patch) | |
tree | b6023cb27e0b6baabcfa2ff588f8e35edafcad72 | |
parent | 3f575cfaee3ecfc5df3ca948f553b8e2ba90900f (diff) | |
download | build-a465d0356c106fe398f35418a738b4a22324b1bd.tar.gz build-a465d0356c106fe398f35418a738b4a22324b1bd.tar.bz2 build-a465d0356c106fe398f35418a738b4a22324b1bd.zip |
ota_from_target_files: Remove more device dependent arguments
Change-Id: Ib23b8e2aa46d0ad37c51eb4c8f586b6047a9c0b0
-rw-r--r-- | core/Makefile | 8 | ||||
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index 5ea1b2a64..75f3b5735 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1852,6 +1852,7 @@ else endif $(hide) echo "ota_override_device=$(OTA_SCRIPT_OVERRIDE_DEVICE)" >> $(zip_root)/META/misc_info.txt $(hide) echo "ota_override_prop=$(OTA_SCRIPT_OVERRIDE_PROP)" >> $(zip_root)/META/misc_info.txt + $(hide) echo "ota_backuptool=$(OTA_SCRIPT_BACKUPTOOL)" >> $(zip_root)/META/misc_info.txt ifneq ($(CM_BUILD),) ifneq ($(TARGET_BUILD_VARIANT),user) @@ -1907,12 +1908,12 @@ else endif ifeq ($(WITH_GMS),true) - $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false + OTA_SCRIPT_BACKUPTOOL := false else ifneq ($(CM_BUILD),) - $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true + OTA_SCRIPT_BACKUPTOOL := true else - $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false + OTA_SCRIPT_BACKUPTOOL := false endif endif @@ -1941,7 +1942,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(block_based) \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ - --backup=$(backuptool) \ $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(BUILT_TARGET_FILES_PACKAGE) $@ diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 682d1a976..7e0df56d8 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -93,9 +93,6 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package Specifies the threshold that will be used to compute the maximum allowed stash size (defaults to 0.8). - --backup <boolean> - Enable or disable the execution of backuptool.sh. - Disabled by default. """ from __future__ import print_function @@ -1679,6 +1676,8 @@ def main(argv): OPTIONS.override_device = OPTIONS.info_dict.get("ota_override_device") if "ota_override_prop" in OPTIONS.info_dict: OPTIONS.override_prop = OPTIONS.info_dict.get("ota_override_prop") == "true" + if "ota_backuptool" in OPTIONS.info_dict: + OPTIONS.backuptool = OPTIONS.info_dict.get("ota_backuptool") == "true" # If this image was originally labelled with SELinux contexts, make sure we # also apply the labels in our new image. During building, the "file_contexts" |