commit b9e912dc9d6dd19761e602c65e6e4d55a74e0470
author Anton Hansson <hansson@google.com> Thu Jan 09 08:46:08 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 09 08:46:08 2020 +0000
tree 612a743c0cb403cbc661a3ebdf4ab586744dcb46
parent 3801c82e331444daa1972fce296e1f913ded130b
parent ea711c24180ecde014daf17f7aeee190bbfb6263

Merge "Update references to sdkext"

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index e0bf6ea..0400856 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1606,7 +1606,7 @@
   endif
 
   ifeq ($(EMMA_INSTRUMENT),true)
-    $(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE_TARGET)
+    $(JACOCO_REPORT_CLASSES_ALL) : $(modules_to_install)
     $(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
   endif
 

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8095212..5d445e0 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-12-05
+      PLATFORM_SECURITY_PATCH := 2020-01-01
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH