diff options
| -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 |