summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndreas Blaesius <skate4life@gmx.de>2017-10-13 19:07:12 (GMT)
committerTim Schumacher <timschumi@gmx.de>2018-06-19 19:16:12 (GMT)
commita465d0356c106fe398f35418a738b4a22324b1bd (patch)
treeb6023cb27e0b6baabcfa2ff588f8e35edafcad72 /core
parent3f575cfaee3ecfc5df3ca948f553b8e2ba90900f (diff)
downloadbuild-a465d0356c106fe398f35418a738b4a22324b1bd.zip
build-a465d0356c106fe398f35418a738b4a22324b1bd.tar.gz
build-a465d0356c106fe398f35418a738b4a22324b1bd.tar.bz2
ota_from_target_files: Remove more device dependent arguments
Change-Id: Ib23b8e2aa46d0ad37c51eb4c8f586b6047a9c0b0
Diffstat (limited to 'core')
-rw-r--r--core/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile
index 5ea1b2a..75f3b57 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) $@