diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index b83ca01b..056390f3 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -1,6 +1,6 @@
 # Copyright 2006 The Android Open Source Project
 
-ifneq ($(BOARD_PROVIDES_LIBRIL),true)
+ifeq ($(BOARD_PROVIDES_LIBRIL),true)
 
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
@@ -36,6 +36,21 @@ ifeq ($(SIM_COUNT), 2)
     LOCAL_CFLAGS += -DANDROID_SIM_COUNT_2
 endif
 
+ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
+LOCAL_CFLAGS += -DMODEM_TYPE_XMM6262
+endif
+ifeq ($(BOARD_MODEM_TYPE),xmm6260)
+LOCAL_CFLAGS += -DMODEM_TYPE_XMM6260
+endif
+ifneq ($(filter m7450 mdm9x35 ss333 tss310 xmm7260,$(BOARD_MODEM_TYPE)),)
+LOCAL_CFLAGS += -DSAMSUNG_NEXT_GEN_MODEM
+endif
+
+ifeq ($(BOARD_MODEM_NEEDS_VIDEO_CALL_FIELD), true)
+LOCAL_CFLAGS += -DNEEDS_VIDEO_CALL_FIELD
+endif
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
 LOCAL_C_INCLUDES += external/nanopb-c
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include