commit dd6a111283e60f365aa4b217f8092a39c39d0750
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 21 18:14:28 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 21 18:14:28 2024 +0000
tree f995cde0a6b31c22b363083375003e595564d9f9
parent 52a9fb0d1b8e65f3520761d1ecb63f61b2d5a591
parent b9d09c68fd1a5ebd1c0a799315946fd111aceef4

Merge "Add CrashRecovery build flag to move files" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 426119f..fd7c02b 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -231,5 +231,13 @@
 
 # Add crashrecovery build flag to soong
 $(call soong_config_set,ANDROID,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))
+# Add crashrecovery file move flags to soong, for both platform and module
+ifeq (true,$(RELEASE_CRASHRECOVERY_FILE_MOVE))
+  $(call soong_config_set,ANDROID,crashrecovery_files_in_module,true)
+  $(call soong_config_set,ANDROID,crashrecovery_files_in_platform,false)
+else
+  $(call soong_config_set,ANDROID,crashrecovery_files_in_module,false)
+  $(call soong_config_set,ANDROID,crashrecovery_files_in_platform,true)
+endif
 # Required as platform_bootclasspath is using this namespace
 $(call soong_config_set,bootclasspath,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))