Merge "Include system_other.img in super.img by default" am: 0fdd73b18f am: dd8414a5ae
am: 8899c7ce3a
Change-Id: Idde143bae80b63aa6e48a75b3254e711768c63a0
diff --git a/core/main.mk b/core/main.mk
index 29c5a4c..a4fb64a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -220,9 +220,6 @@
ADDITIONAL_BUILD_PROPERTIES += persist.debug.dalvik.vm.core_platform_api_policy=just-warn
endif
-# Define ro.sanitize.<name> properties for all global sanitizers.
-ADDITIONAL_BUILD_PROPERTIES += $(foreach s,$(SANITIZE_TARGET),ro.sanitize.$(s)=true)
-
# Sets the default value of ro.postinstall.fstab.prefix to /system.
# Device board config should override the value to /product when needed by:
#
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index aad0caf..8095212 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -250,7 +250,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-11-05
+ PLATFORM_SECURITY_PATCH := 2019-12-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH