Merge "Q Branch prefix is QP1A" into qt-dev
diff --git a/core/Makefile b/core/Makefile
index b4722da..a0e96d6 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -280,10 +280,6 @@
echo "#" >> $@;
$(hide) $(foreach line,$(FINAL_DEFAULT_PROPERTIES), \
echo "$(line)" >> $@;)
- $(hide) echo "#" >> $@; \
- echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \
- echo "#" >> $@;
- $(hide) $(call generate-common-build-props,bootimage,$@)
$(hide) build/make/tools/post_process_props.py $@
ifdef property_overrides_split_enabled
$(hide) mkdir -p $(TARGET_ROOT_OUT)
@@ -532,6 +528,10 @@
$(hide) echo ro.sf.lcd_density="$(TARGET_SCREEN_DENSITY)">>$@
endif
$(hide) $(call generate-common-build-props,vendor,$@)
+ $(hide) echo "#" >> $@; \
+ echo "# BOOTIMAGE_BUILD_PROPERTIES" >> $@; \
+ echo "#" >> $@;
+ $(hide) $(call generate-common-build-props,bootimage,$@)
ifdef property_overrides_split_enabled
$(hide) echo "#" >> $@; \
echo "# ADDITIONAL VENDOR BUILD PROPERTIES" >> $@; \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 9abb108..47f7021 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -259,7 +259,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# 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 := 2019-05-05
+ PLATFORM_SECURITY_PATCH := 2019-06-01
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH