From 9edbf981f26225431542574483b910161a1a93a0 Mon Sep 17 00:00:00 2001 From: Harshit Mahajan Date: Thu, 1 Feb 2024 00:46:06 +0000 Subject: [PATCH] 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 Change-Id: Id3674bd6a8a32f64d189b8ac17b222b9d7966f69 Merged-In: Id3674bd6a8a32f64d189b8ac17b222b9d7966f69 --- core/android_soong_config_vars.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 5afdd6c72d..05a630c7c5 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -203,5 +203,12 @@ endif # Add crashrecovery build flag to soong $(call soong_config_set,ANDROID,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_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 # Weirdly required because platform_bootclasspath is using AUTO namespace $(call soong_config_set,AUTO,release_crashrecovery_module,$(RELEASE_CRASHRECOVERY_MODULE))