Add CrashRecovery build flag to move files
Files need to be moved from platform to the new apex.
Adding a flag to control this movement.
More Details: go/conditionally-move-android-files
Bug: b/289203818
Test: m
Ignore-AOSP-First: merge conflicts in AOSP aosp/2942585
Change-Id: Id3674bd6a8a32f64d189b8ac17b222b9d7966f69
---
(cherry picked from https://android-review.googlesource.com/q/commit:b99913a726a99b85616270ebfccb4e74a0c71052 due to merge conflicts)
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))