commit eeb7df7cf49f6abc3c185818da43f3054dc2e29b
author K Yasu <kyasu.m2@gmail.com> Tue Apr 07 22:10:03 2015 +0900
committer Ethan Chen <intervigil@gmail.com> Tue Apr 07 17:12:23 2015 +0000
tree 780b57ef7bad8bf60dd61e6b6feb1747144d9a7e
parent e32dbfd56b6ee0152a320fad990350baf52a3240

Fix the build error of some samsung devices which provides libril (e.g. ks01lte)

This fixes the merge error of commit 56b8dcfa3094f93698dda9f6731fa845f00ef287

Change-Id: I0efd718a85376059cad57ac9715673cbfb2e596f
(cherry picked from commit f8e5e164804f1408c2350dade3fd92d561e7076c)

ril/Android.mk

diff --git a/ril/Android.mk b/ril/Android.mk
index 05a6c98..2aa2119 100644
--- a/ril/Android.mk
+++ b/ril/Android.mk
@@ -20,8 +20,10 @@
 
 # libril
 ifeq ($(BOARD_PROVIDES_LIBRIL),true)
+ifneq ($(filter xmm6260 xmm6262 xmm6360 xmm7260,$(BOARD_MODEM_TYPE)),)
 include $(RIL_PATH)/libril/Android.mk
 endif
+endif
 
 # ril client
 SECRIL_CLIENT_DIRS := libsecril-client libsecril-client-sap