diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2017-05-15 16:41:44 -0700 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2017-10-07 08:25:42 +0000 |
| commit | d8fb8ff10d860f683eb0794a4e75983dba37d03f (patch) | |
| tree | 1f96ef3a5707131e7c8869b6e1181cff5f162b7d | |
| parent | 4609708d92fda0f682360379e08fb21f685b376c (diff) | |
| download | android_hardware_ril-cm-14.1.tar.gz android_hardware_ril-cm-14.1.tar.bz2 android_hardware_ril-cm-14.1.zip | |
Fix multi sim support and warningscm-14.1
Change-Id: I09f682ee5641c7921a4cf1f8f041c7e12ec2df02
| -rw-r--r-- | include/telephony/ril.h | 3 | ||||
| -rw-r--r-- | libril/Android.mk | 3 | ||||
| -rw-r--r-- | rild/Android.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 5fcd901..9b6a942 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -31,7 +31,7 @@ extern "C" { #endif - +#ifndef SIM_COUNT #if defined(ANDROID_SIM_COUNT_2) #define SIM_COUNT 2 #elif defined(ANDROID_SIM_COUNT_3) @@ -41,6 +41,7 @@ extern "C" { #else #define SIM_COUNT 1 #endif +#endif #ifndef ANDROID_MULTI_SIM #define SIM_COUNT 1 diff --git a/libril/Android.mk b/libril/Android.mk index daf70e7..7e23b69 100644 --- a/libril/Android.mk +++ b/libril/Android.mk @@ -22,9 +22,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libprotobuf-c-nano-enable_malloc \ -#LOCAL_CFLAGS := -DANDROID_MULTI_SIM -DDSDA_RILD1 - ifeq ($(SIM_COUNT), 2) + LOCAL_CFLAGS := -DANDROID_MULTI_SIM LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2 endif diff --git a/rild/Android.mk b/rild/Android.mk index 9a94976..46603d3 100644 --- a/rild/Android.mk +++ b/rild/Android.mk @@ -20,9 +20,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ librilutils_static LOCAL_CFLAGS := -DRIL_SHLIB -#LOCAL_CFLAGS += -DANDROID_MULTI_SIM ifeq ($(SIM_COUNT), 2) + LOCAL_CFLAGS += -DANDROID_MULTI_SIM LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2 endif |