commit dca45499eb6b9771f348266b12557d7c8ed004d6
author Mathew Inwood <mathewi@google.com> Fri Jul 30 10:43:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 30 10:43:50 2021 +0000
tree 65ec3f65b49fe4aefdf4fb1af41a38121682c0ee
parent 228a5df289fb5978574e4c354347ca8b44f29dd7
parent e24af74376b4b5accb5771537fbbe2a3afb04057

Add libincident. am: e24af74376

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15411834

Change-Id: I741634e1f4db5d7cdc315b58109688be934daf7f

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 39f0155..9d7c1bf 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -82,7 +82,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 663579a..31c30b6 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -93,7 +93,7 @@
 
 # These are the current development codenames, if the build is not a final
 # release build.  If this is a final release build, it is simply "REL".
-PLATFORM_VERSION_CODENAME.SP1A := REL
+PLATFORM_VERSION_CODENAME.SP1A := S
 
 ifndef PLATFORM_VERSION_CODENAME
   PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))