| commit | dd16204e3ed6f7020a0097667782b5a0ded75810 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Sep 14 21:57:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 14 21:57:47 2021 +0000 |
| tree | b38d8976c6d2167f59f8da960bfc00e74e256667 | |
| parent | 42e4a4a73cbb15cde548f8363222205932cd3706 [diff] | |
| parent | 5b79cdb61fdc17c5ab56b04d58bd12b1b4118dd5 [diff] |
[automerger skipped] Merge "Move the stable code from version_defaults.mk to version_util.mk." into sc-dev-plus-aosp am: 2c3c8d5ab1 am: 5b79cdb61f -s ours am skip reason: Merged-In I4798fb69c639e6d52d275a5b793fa0c8ba876202 with SHA-1 9a9da6024c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15828153 Change-Id: I076df41f1dc8052ce2e505aa2f730558eecdf50d
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