Merge "Make the script python3." am: fe9efa5a61 am: 69dd474c35 am: f52cfa547f am: 164629ec00
Original change: https://android-review.googlesource.com/c/platform/build/+/1822532
Change-Id: Ie7dbdfa505c0fa5f480dfd3de9c20dcf8d998c61
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index fcf2cd6..6a0deae 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
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1366a85..dcd0d1d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -52,6 +52,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.SP2A := Sv2
PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
ifndef PLATFORM_SDK_VERSION