summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-08-10 14:32:04 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-08-10 14:32:04 +0000
commit6ff2cd56c804a58509e1a13d6350d3f49d83b122 (patch)
tree96555904b4200f2e7afdf0a8eb177d4f54f9f2bc
parent935de412d66631aa074c32246bc0f2eb338a91b0 (diff)
parent8ee5a6b5433d0e46f0257115e1221fc1982d494a (diff)
downloadandroid_hardware_samsung-6ff2cd56c804a58509e1a13d6350d3f49d83b122.tar.gz
android_hardware_samsung-6ff2cd56c804a58509e1a13d6350d3f49d83b122.tar.bz2
android_hardware_samsung-6ff2cd56c804a58509e1a13d6350d3f49d83b122.zip
Merge "xmm6262: Use xmm6262 libril for xmm6360 modem as well" into cm-10.2
-rw-r--r--ril/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/ril/Android.mk b/ril/Android.mk
index eba6ce6..09768bd 100644
--- a/ril/Android.mk
+++ b/ril/Android.mk
@@ -20,12 +20,12 @@ ifeq ($(BOARD_VENDOR),samsung)
# libril
ifeq ($(BOARD_PROVIDES_LIBRIL),true)
+ifneq ($(filter xmm6262 xmm6360,$(BOARD_MODEM_TYPE)),)
+include $(RIL_PATH)/xmm6262/libril/Android.mk
+endif
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
include $(RIL_PATH)/xmm6260/libril/Android.mk
endif
-ifeq ($(BOARD_MODEM_TYPE),xmm6262)
-include $(RIL_PATH)/xmm6262/libril/Android.mk
-endif
endif
# ril client