| commit | 1157154fc10bab8f3abf7b77b2608960fffb75f1 | [log] [tgz] |
|---|---|---|
| author | Bowgo Tsai <bowgotsai@google.com> | Fri Jul 23 18:31:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 23 18:31:04 2021 +0000 |
| tree | f34c472e48c656d4f468defc373761b28bc43e5a | |
| parent | c5e1376d7a6877e46aaf2273451e6aa043d18f40 [diff] | |
| parent | 5f3598bb2fe06e10ecbc9d9734298f740004813f [diff] |
[automerger skipped] Sets BOOT_SECURITY_PATCH for the generic boot.img am: 008599f7e9 -s ours am: 5f3598bb2f -s ours am skip reason: Merged-In I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe with SHA-1 81a23fed56 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15360180 Change-Id: Ib4aa833a89d4c25c6b470811f4bfffa2ae493115
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index ed18b8b..0b7a338 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk
@@ -76,7 +76,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 90e1825..cd3d999 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk
@@ -93,7 +93,6 @@ # 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.TP1A := T ifndef PLATFORM_VERSION_CODENAME