commit 3c68c36a1e8f4699c53bc6fc6009e31f15a5c124
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Oct 02 02:37:03 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 02 02:37:03 2024 +0000
tree ca1b7129f799733b688ac48af5e36baedc5bbac2
parent 1664516116195f7d05c7282babf9e7613f2e453e
parent e89581b7758d7d6c2922a28b377f944080239832

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

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

Change-Id: I88c43f6bdbce262963379e24caed54a2401e0fcd
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 cb5575b..e5f0858 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -192,3 +192,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