Merge "Replace GENERATE_BAZEL_FILES=1 with "m bp2build"." am: f673d10736 am: af7f572207 am: d6d5fbd463 am: 375370fdaa
Original change: https://android-review.googlesource.com/c/platform/build/+/1818098
Change-Id: I5f9521e41b5cb4df16c5a5999e9f9580241b67e1
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index efc4b63..6fb14cd 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -80,7 +80,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 8eac1ac..d7fcb28 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -93,6 +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.SP2A := Sv2
PLATFORM_VERSION_CODENAME.TP1A := Tiramisu
ifndef PLATFORM_VERSION_CODENAME