diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:38:54 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-02-11 22:38:54 +0100 |
| commit | 530288f5a725848bb899636665ea3f14f9398fad (patch) | |
| tree | 097879192b3926c5c6503b058d3582d680110bfc /core/Makefile | |
| parent | 34b65b9553c9395846ae1bbe186be2667139db79 (diff) | |
| parent | fafb7e2a14706f75bd76aca21c1c7d695f938ed3 (diff) | |
| download | build-530288f5a725848bb899636665ea3f14f9398fad.zip build-530288f5a725848bb899636665ea3f14f9398fad.tar.gz build-530288f5a725848bb899636665ea3f14f9398fad.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_build into replicant-6.0
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index 5475edc..16eb5a1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1540,7 +1540,9 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ + $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh \ $(HOST_OUT_EXECUTABLES)/make_ext4fs \ + $(HOST_OUT_EXECUTABLES)/make_f2fs \ $(HOST_OUT_EXECUTABLES)/simg2img \ $(HOST_OUT_EXECUTABLES)/e2fsck \ $(HOST_OUT_EXECUTABLES)/build_verity_tree \ @@ -1562,7 +1564,8 @@ DISTTOOLS += \ $(HOST_LIBRARY_PATH)/libext2_e2p_host$(HOST_SHLIB_SUFFIX) \ $(HOST_LIBRARY_PATH)/libext2_profile_host$(HOST_SHLIB_SUFFIX) \ $(HOST_LIBRARY_PATH)/libext2_quota_host$(HOST_SHLIB_SUFFIX) \ - $(HOST_LIBRARY_PATH)/libext2_uuid_host$(HOST_SHLIB_SUFFIX) + $(HOST_LIBRARY_PATH)/libext2_uuid_host$(HOST_SHLIB_SUFFIX) \ + $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX) OTATOOLS := $(DISTTOOLS) \ $(HOST_OUT_EXECUTABLES)/aapt @@ -1843,6 +1846,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, @@ -1897,15 +1902,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_DEVICE) endif endif @@ -1915,7 +1920,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 \ @@ -1923,7 +1927,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) $@ |