commit d453b023be76b77ea987063114b27b890bbd0087
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 02 02:59:56 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 02 02:59:56 2024 +0000
tree 16c08e1a25ae825ef8c97cdbe4677f29fd06f8e8
parent 7885667655aee2ae282b04c16c666045bffbb726
parent 3c68c36a1e8f4699c53bc6fc6009e31f15a5c124

Merge "Export ril related flag to soong" into main am: e89581b775 am: 3c68c36a1e

Original change: https://android-review.googlesource.com/c/platform/build/+/3272222

Change-Id: I8840d971780a552f090a60cba54a6dbbba481af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index c804afd..909f6c2 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -209,3 +209,12 @@
 ifneq ($(strip $(AUDIOSERVER_MULTILIB)),)
   $(call soong_config_set,soundtrigger,audioserver_multilib,$(AUDIOSERVER_MULTILIB))
 endif
+
+# Add sim_count, disable_rild_oem_hook, and use_aosp_rild flag for ril related modules
+$(call soong_config_set,ril,sim_count,$(SIM_COUNT))
+ifneq ($(DISABLE_RILD_OEM_HOOK), false)
+  $(call soong_config_set_bool,ril,disable_rild_oem_hook,true)
+endif
+ifneq ($(ENABLE_VENDOR_RIL_SERVICE), true)
+  $(call soong_config_set_bool,ril,use_aosp_rild,true)
+endif