commit 0a9962fd9e1830cf43ff12a78b672136e836c5a7
author Xin Li <delphij@google.com> Mon Dec 13 21:34:59 2021 -0800
committer Xin Li <delphij@google.com> Tue Dec 14 08:38:55 2021 -0800
tree 9ff4ae49e308046fc89facbcb1aa3c23bb41afb8
parent e23891877c1d12ea3d70ad44420a0949baf9f4b4
parent c95816ce4b7e375f71fc9d15425584730dbc0ee1

Merge Android 12 QPR1

Bug: 210511427
Merged-In: Ib836574268ae722da7a06d53d2014daa5877a991
Change-Id: Ic04e8e0274868bc7ccf3ac454ed0217beff382a0

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index cd42e1f..d24449b 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -88,7 +88,7 @@
   # This sets the default for building ART APEXes from source rather than
   # prebuilts (in packages/modules/ArtPrebuilt and prebuilt/module_sdk/art) in
   # all other platform builds.
-  SOONG_CONFIG_art_module_source_build ?= false
+  SOONG_CONFIG_art_module_source_build ?= true
 endif
 
 # Apex build mode variables

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1f1ec3f..8432513 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -85,7 +85,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 := 2021-11-05
+    PLATFORM_SECURITY_PATCH := 2021-11-05
 endif
 .KATI_READONLY := PLATFORM_SECURITY_PATCH