diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:08:47 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-11 21:08:47 +0000 |
| commit | b5a8c217cbbb720381e5f14f36ec1b65450fb0df (patch) | |
| tree | 019abd72f75e9090964c2134b9e23517aabc0671 | |
| parent | ad3c37bdce94f60bb5269b3f8d2a51e0a2f87da5 (diff) | |
| parent | 3fa302e04fe0bbd52b2eccb2359ac9b1bf9c627f (diff) | |
| download | build-b5a8c217cbbb720381e5f14f36ec1b65450fb0df.tar.gz | |
Snap for 6001299 from 3fa302e04fe0bbd52b2eccb2359ac9b1bf9c627f to qt-aml-media-releaseandroid-mainline-10.0.0_r7android-mainline-10.0.0_r5
Change-Id: Ib46ca1637a9713e1da5c6dd736ee348695403d6c
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 | ||||
| -rw-r--r-- | target/product/handheld_product.mk | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 4253b7200e..9c0804e615 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3559,6 +3559,7 @@ endif ifeq ($(build_otatools_package),true) OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/aapt \ + $(HOST_OUT_EXECUTABLES)/aapt2 \ $(HOST_OUT_EXECUTABLES)/checkvintf \ $(HOST_OUT_EXECUTABLES)/mkbootfs \ $(HOST_OUT_EXECUTABLES)/mkbootimg \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index b803ff81ab..892a07d39d 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk index 0d100b267f..54dcaf25ec 100644 --- a/target/product/handheld_product.mk +++ b/target/product/handheld_product.mk @@ -27,7 +27,6 @@ PRODUCT_PACKAGES += \ Camera2 \ Contacts \ DeskClock \ - Email \ Gallery2 \ LatinIME \ Launcher3QuickStep \ |