summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-07-08 17:11:45 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-07-08 17:11:45 +0200
commitc0e536a0d0b19704c115c7281d10e85ce7b760a4 (patch)
treea2a33490580bfe7064d24e2c7221d87ffb538003
parent601dc8581733786120d590f2c8797f4feeb84b44 (diff)
downloadandroid_hardware_samsung-c0e536a0d0b19704c115c7281d10e85ce7b760a4.tar.gz
android_hardware_samsung-c0e536a0d0b19704c115c7281d10e85ce7b760a4.tar.bz2
android_hardware_samsung-c0e536a0d0b19704c115c7281d10e85ce7b760a4.zip
samsung: move ril client out of exynos4
Change-Id: I8aa0470652c060a531d2cc7f2d8c68d3c40f5f95
-rw-r--r--exynos4/ril/Android.mk20
-rw-r--r--ril/Android.mk10
-rwxr-xr-xril/libsecril-client-sap/Android.mk (renamed from exynos4/ril/libsecril-client-sap/Android.mk)0
-rw-r--r--ril/libsecril-client-sap/MODULE_LICENSE_APACHE2 (renamed from exynos4/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2)0
-rwxr-xr-xril/libsecril-client-sap/NOTICE (renamed from exynos4/ril/libsecril-client-sap/NOTICE)0
-rwxr-xr-xril/libsecril-client-sap/secril-client-sap.cpp (renamed from exynos4/ril/libsecril-client-sap/secril-client-sap.cpp)0
-rwxr-xr-xril/libsecril-client-sap/secril-client-sap.h (renamed from exynos4/ril/libsecril-client-sap/secril-client-sap.h)0
-rwxr-xr-xril/libsecril-client/Android.mk (renamed from exynos4/ril/libsecril-client/Android.mk)0
-rwxr-xr-xril/libsecril-client/secril-client.cpp (renamed from exynos4/ril/libsecril-client/secril-client.cpp)0
-rwxr-xr-xril/libsecril-client/secril-client.h (renamed from exynos4/ril/libsecril-client/secril-client.h)0
-rwxr-xr-xril/secril_multi/Oem_ril_sap.h (renamed from exynos4/ril/secril_multi/Oem_ril_sap.h)0
11 files changed, 7 insertions, 23 deletions
diff --git a/exynos4/ril/Android.mk b/exynos4/ril/Android.mk
deleted file mode 100644
index f0b7ec0..0000000
--- a/exynos4/ril/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
-ril_dirs := libsecril-client libsecril-client-sap
-include $(call all-named-subdir-makefiles,$(ril_dirs))
-endif
diff --git a/ril/Android.mk b/ril/Android.mk
index 938bbde..2baf6e6 100644
--- a/ril/Android.mk
+++ b/ril/Android.mk
@@ -17,16 +17,20 @@
LOCAL_PATH := $(call my-dir)
ifeq ($(BOARD_VENDOR),samsung)
-ifeq ($(BOARD_PROVIDES_LIBRIL),true)
+# libril
+ifeq ($(BOARD_PROVIDES_LIBRIL),true)
ifeq ($(BOARD_MODEM_TYPE),xmm6260)
include $(LOCAL_PATH)/xmm6260/libril/Android.mk
endif
-
ifeq ($(BOARD_MODEM_TYPE),xmm6262)
include $(LOCAL_PATH)/xmm6262/libril/Android.mk
endif
-
endif
+
+# ril client
+client_dirs := libsecril-client libsecril-client-sap
+include $(call all-named-subdir-makefiles,$(client_dirs))
+
endif
diff --git a/exynos4/ril/libsecril-client-sap/Android.mk b/ril/libsecril-client-sap/Android.mk
index d427271..d427271 100755
--- a/exynos4/ril/libsecril-client-sap/Android.mk
+++ b/ril/libsecril-client-sap/Android.mk
diff --git a/exynos4/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2 b/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
index e69de29..e69de29 100644
--- a/exynos4/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
+++ b/ril/libsecril-client-sap/MODULE_LICENSE_APACHE2
diff --git a/exynos4/ril/libsecril-client-sap/NOTICE b/ril/libsecril-client-sap/NOTICE
index c5b1efa..c5b1efa 100755
--- a/exynos4/ril/libsecril-client-sap/NOTICE
+++ b/ril/libsecril-client-sap/NOTICE
diff --git a/exynos4/ril/libsecril-client-sap/secril-client-sap.cpp b/ril/libsecril-client-sap/secril-client-sap.cpp
index 33f6851..33f6851 100755
--- a/exynos4/ril/libsecril-client-sap/secril-client-sap.cpp
+++ b/ril/libsecril-client-sap/secril-client-sap.cpp
diff --git a/exynos4/ril/libsecril-client-sap/secril-client-sap.h b/ril/libsecril-client-sap/secril-client-sap.h
index 45e2301..45e2301 100755
--- a/exynos4/ril/libsecril-client-sap/secril-client-sap.h
+++ b/ril/libsecril-client-sap/secril-client-sap.h
diff --git a/exynos4/ril/libsecril-client/Android.mk b/ril/libsecril-client/Android.mk
index c9ec41f..c9ec41f 100755
--- a/exynos4/ril/libsecril-client/Android.mk
+++ b/ril/libsecril-client/Android.mk
diff --git a/exynos4/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp
index 2dcd16b..2dcd16b 100755
--- a/exynos4/ril/libsecril-client/secril-client.cpp
+++ b/ril/libsecril-client/secril-client.cpp
diff --git a/exynos4/ril/libsecril-client/secril-client.h b/ril/libsecril-client/secril-client.h
index fb1729c..fb1729c 100755
--- a/exynos4/ril/libsecril-client/secril-client.h
+++ b/ril/libsecril-client/secril-client.h
diff --git a/exynos4/ril/secril_multi/Oem_ril_sap.h b/ril/secril_multi/Oem_ril_sap.h
index 7184ad8..7184ad8 100755
--- a/exynos4/ril/secril_multi/Oem_ril_sap.h
+++ b/ril/secril_multi/Oem_ril_sap.h