projects
/
GitHub
/
LineageOS
/
android_hardware_samsung.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e32dbfd
)
Fix the build error of some samsung devices which provides libril (e.g. ks01lte)
author
K Yasu
<kyasu.m2@gmail.com>
Tue, 7 Apr 2015 13:10:03 +0000
(22:10 +0900)
committer
Ethan Chen
<intervigil@gmail.com>
Tue, 7 Apr 2015 17:12:23 +0000
(17:12 +0000)
This fixes the merge error of commit
56b8dcfa3094f93698dda9f6731fa845f00ef287
Change-Id: I0efd718a85376059cad57ac9715673cbfb2e596f
(cherry picked from commit
f8e5e164804f1408c2350dade3fd92d561e7076c
)
ril/Android.mk
patch
|
blob
|
blame
|
history
diff --git
a/ril/Android.mk
b/ril/Android.mk
index 05a6c9804bff0c79a386ebffc5f71b31d3b30a79..2aa2119b0dcb13654c93034356db192b1584257c 100644
(file)
--- a/
ril/Android.mk
+++ b/
ril/Android.mk
@@
-20,8
+20,10
@@
ifeq ($(BOARD_VENDOR),samsung)
# 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