Merge "Revert "Moving GSI-specific files to system_ext"" am: 414108c6c1
am: b5195f128d
Change-Id: Id836293b44a5456dfaf6a66bca5b83f5d3f2459e
diff --git a/core/Makefile b/core/Makefile
index 8e48fbc..148b4ce 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3688,7 +3688,7 @@
ifneq (,$(wildcard device))
INTERNAL_OTATOOLS_PACKAGE_FILES += \
$(sort $(shell find device $(wildcard vendor) -type f -name "*.pk8" -o -name "verifiedboot*" -o \
- -name "*.x509.pem" -o -name "oem*.prop"))
+ -name "*.pem" -o -name "oem*.prop" -o -name "*.avbpubkey"))
endif
ifneq (,$(wildcard external/avb))
INTERNAL_OTATOOLS_PACKAGE_FILES += \
diff --git a/core/tasks/mts.mk b/core/tasks/mts.mk
index 56b2390..e800505 100644
--- a/core/tasks/mts.mk
+++ b/core/tasks/mts.mk
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+ifneq ($(wildcard test/mts/README.md),)
test_suite_name := mts
test_suite_tradefed := mts-tradefed
test_suite_readme := test/mts/README.md
@@ -21,3 +22,4 @@
.PHONY: mts
mts: $(compatibility_zip)
$(call dist-for-goals, mts, $(compatibility_zip))
+endif
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 00c5ed0..68628e9 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-09-05
+ PLATFORM_SECURITY_PATCH := 2019-10-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH