Merge branch 'cm-13.0' of https://github.com/LineageOS/android_build into replicant-6.0replicant-6.0-0001

5 files changed, 22 insertions, 9 deletions

diff --git a/core/Makefile b/core/Makefile
index 16eb5a1..683013f 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1657,6 +1657,15 @@ ifeq ($(BOARD_USES_UBOOT_MULTIIMAGE),true)
 
 endif
 
+ifneq ($(CM_BUILD),)
+ifneq ($(TARGET_BUILD_VARIANT),user)
+ifneq ($(WITH_SU),true)
+# Build su without installing it
+$(BUILT_TARGET_FILES_PACKAGE): $(ALL_MODULES.su.BUILT)
+endif
+endif
+endif
+
 # Depending on the various images guarantees that the underlying
 # directories are up-to-date.
 include $(BUILD_SYSTEM)/tasks/oem_image.mk
@@ -1848,6 +1857,17 @@ 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
+
+ifneq ($(CM_BUILD),)
+ifneq ($(TARGET_BUILD_VARIANT),user)
+ifneq ($(WITH_SU),true)
+	$(hide) echo "addonsu_updater=true" >> $(zip_root)/META/misc_info.txt
+	$(hide) mkdir $(zip_root)/EXTRA
+	$(hide) cp $(ALL_MODULES.su.BUILT) $(zip_root)/EXTRA
+endif
+endif
+endif
+
 	@# Zip everything up, preserving symlinks
 	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)
 	@# Run fs_config on all the system, vendor, boot ramdisk,
diff --git a/core/build_id.mk b/core/build_id.mk
index 8928324..ca6a6c6 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=MOB31K
+export BUILD_ID=MOB31T
diff --git a/core/generate_extra_images.mk b/core/generate_extra_images.mk
index f7fb0c5..664b963 100644
--- a/core/generate_extra_images.mk
+++ b/core/generate_extra_images.mk
@@ -18,10 +18,8 @@ ifeq ($(TARGET_BOOTIMG_SIGNED),true)
 INSTALLED_SEC_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img.secure
 INSTALLED_SEC_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img.secure
 
-ifneq ($(BUILD_TINY_ANDROID),true)
 intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch)
 RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p
-endif
 
 ifndef TARGET_SHA_TYPE
   TARGET_SHA_TYPE := sha256
@@ -47,10 +45,8 @@ ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_SEC_BOOTIMAGE_TARGET)
 $(INSTALLED_SEC_RECOVERYIMAGE_TARGET): $(INSTALLED_RECOVERYIMAGE_TARGET) $(RECOVERY_FROM_BOOT_PATCH)
 	$(hide) $(call build-sec-image,$(INSTALLED_RECOVERYIMAGE_TARGET))
 
-ifneq ($(BUILD_TINY_ANDROID),true)
 ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_SEC_RECOVERYIMAGE_TARGET)
 ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_SEC_RECOVERYIMAGE_TARGET)
-endif # !BUILD_TINY_ANDROID
 endif # TARGET_BOOTIMG_SIGNED
 
 #----------------------------------------------------------------------
diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk
index 60d45cc..3bca467 100644
--- a/core/tasks/dt_image.mk
+++ b/core/tasks/dt_image.mk
@@ -4,9 +4,6 @@
 ifeq ($(strip $(BOARD_CUSTOM_BOOTIMG_MK)),)
 ifeq ($(strip $(BOARD_KERNEL_SEPARATED_DT)),true)
 ifneq ($(strip $(BOARD_KERNEL_PREBUILT_DT)),true)
-ifeq ($(strip $(BUILD_TINY_ANDROID)),true)
-include device/qcom/common/dtbtool/Android.mk
-endif
 
 ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),)
 DTBTOOL_NAME := dtbToolCM
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 65bbf74..ffd15d4 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
   #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
   #
   #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-  PLATFORM_SECURITY_PATCH := 2017-01-01
+  PLATFORM_SECURITY_PATCH := 2017-04-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"