summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile
index eb9d5fd..aff7821 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1838,6 +1838,8 @@ ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE
else
$(hide) build/tools/getb64key.py $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem > $(zip_root)/META/releasekey.txt
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
@# Zip everything up, preserving symlinks
$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
@# Run fs_config on all the system, vendor, boot ramdisk,
@@ -1892,15 +1894,15 @@ endif
endif
ifeq ($(TARGET_OTA_ASSERT_DEVICE),)
- $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto
+ OTA_SCRIPT_OVERRIDE_DEVICE := auto
else
- $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE)
+ OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE)
endif
ifneq ($(TARGET_UNIFIED_DEVICE),)
- $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := --override_prop=true
+ OTA_SCRIPT_OVERRIDE_PROP := true
ifeq ($(TARGET_OTA_ASSERT_DEVICE),)
- $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_DEVICE)
+ OTA_SCRIPT_OVERRIDE_DEVICE := $(TARGET_OTA_ASSERT_DEVICE)
endif
endif
@@ -1910,7 +1912,6 @@ endif
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
@echo "$(OTA_FROM_TARGET_SCRIPT)" > $(PRODUCT_OUT)/ota_script_path
- @echo "$(override_device)" > $(PRODUCT_OUT)/ota_override_device
@echo -e ${CL_YLW}"Package OTA:"${CL_RST}" $@"
$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \
$(OTA_FROM_TARGET_SCRIPT) -v \
@@ -1918,7 +1919,6 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)
-p $(HOST_OUT) \
-k $(KEY_CERT_PAIR) \
--backup=$(backuptool) \
- --override_device=$(override_device) $(override_prop) \
$(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \
$(BUILT_TARGET_FILES_PACKAGE) $@