From 8f9268e5987d46937069c4683d1fd7b6ebfe21da Mon Sep 17 00:00:00 2001
From: "Christopher N. Hesse" <raymanfx@gmail.com>
Date: Fri, 20 Oct 2017 18:34:57 +0200
Subject: [PATCH] libril: Fix multisim flags

Change-Id: Idb2ea518c115c1dbfbbbbb79094938ce006f40d8
(cherry picked from commit c98cc605c67e950bf14aa9f0d14966382ec45a0c)
---
 ril/libril/Android.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 79398670..b0f982d3 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -22,18 +22,21 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_STATIC_LIBRARIES := \
     libprotobuf-c-nano-enable_malloc \
 
+LOCAL_CFLAGS :=
+
 ifeq ($(SIM_COUNT), 2)
+    LOCAL_CFLAGS += -DANDROID_MULTI_SIM
     LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
 endif
 
 ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
-LOCAL_CFLAGS := -DMODEM_TYPE_XMM6262
+LOCAL_CFLAGS += -DMODEM_TYPE_XMM6262
 endif
 ifeq ($(BOARD_MODEM_TYPE),xmm6260)
-LOCAL_CFLAGS := -DMODEM_TYPE_XMM6260
+LOCAL_CFLAGS += -DMODEM_TYPE_XMM6260
 endif
 ifneq ($(filter m7450 mdm9x35 ss333 tss310 xmm7260,$(BOARD_MODEM_TYPE)),)
-LOCAL_CFLAGS := -DSAMSUNG_NEXT_GEN_MODEM
+LOCAL_CFLAGS += -DSAMSUNG_NEXT_GEN_MODEM
 endif
 
 ifeq ($(BOARD_MODEM_NEEDS_VIDEO_CALL_FIELD), true)