From e3365c5214b4d20702852955143a2938e94f8a1d Mon Sep 17 00:00:00 2001
From: Andreas Blaesius <skate4life@gmx.de>
Date: Sat, 10 Sep 2016 17:32:22 +0200
Subject: espresso3g: move libsecril-compat source to rilsrc folder

Change-Id: Ib43a33f4efcacce50b0bf7e3627db6ba0060501d
---
 libsecril-compat/Android.mk             | 17 -----------------
 libsecril-compat/secril-compat.c        | 13 -------------
 rilsrc/libsecril-compat/Android.mk      | 17 +++++++++++++++++
 rilsrc/libsecril-compat/secril-compat.c | 13 +++++++++++++
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 libsecril-compat/Android.mk
 delete mode 100644 libsecril-compat/secril-compat.c
 create mode 100644 rilsrc/libsecril-compat/Android.mk
 create mode 100644 rilsrc/libsecril-compat/secril-compat.c

diff --git a/libsecril-compat/Android.mk b/libsecril-compat/Android.mk
deleted file mode 100644
index ee6c91b..0000000
--- a/libsecril-compat/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := \
-	secril-compat.c
-
-LOCAL_SHARED_LIBRARIES := \
-	libhardware_legacy \
-	libbinder
-
-LOCAL_CFLAGS := -Wall -Werror
-
-LOCAL_MODULE := libsecril-compat
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/libsecril-compat/secril-compat.c b/libsecril-compat/secril-compat.c
deleted file mode 100644
index fc11450..0000000
--- a/libsecril-compat/secril-compat.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <sys/types.h>
-
-/**
- * With the switch to C++11 by default, char16_t became a unique type,
- * rather than basically just a typedef of uint16_t. As a result, the
- * compiler now mangles the symbol for writeString16 differently. Our
- * RIL references the old symbol of course, not the new one.
- */
-uintptr_t _ZN7android6Parcel13writeString16EPKDsj(void *instance, void *str, size_t len);
-uintptr_t _ZN7android6Parcel13writeString16EPKtj(void *instance, void *str, size_t len)
-{
-	return _ZN7android6Parcel13writeString16EPKDsj(instance, str, len);
-}
diff --git a/rilsrc/libsecril-compat/Android.mk b/rilsrc/libsecril-compat/Android.mk
new file mode 100644
index 0000000..ee6c91b
--- /dev/null
+++ b/rilsrc/libsecril-compat/Android.mk
@@ -0,0 +1,17 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := \
+	secril-compat.c
+
+LOCAL_SHARED_LIBRARIES := \
+	libhardware_legacy \
+	libbinder
+
+LOCAL_CFLAGS := -Wall -Werror
+
+LOCAL_MODULE := libsecril-compat
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/rilsrc/libsecril-compat/secril-compat.c b/rilsrc/libsecril-compat/secril-compat.c
new file mode 100644
index 0000000..fc11450
--- /dev/null
+++ b/rilsrc/libsecril-compat/secril-compat.c
@@ -0,0 +1,13 @@
+#include <sys/types.h>
+
+/**
+ * With the switch to C++11 by default, char16_t became a unique type,
+ * rather than basically just a typedef of uint16_t. As a result, the
+ * compiler now mangles the symbol for writeString16 differently. Our
+ * RIL references the old symbol of course, not the new one.
+ */
+uintptr_t _ZN7android6Parcel13writeString16EPKDsj(void *instance, void *str, size_t len);
+uintptr_t _ZN7android6Parcel13writeString16EPKtj(void *instance, void *str, size_t len)
+{
+	return _ZN7android6Parcel13writeString16EPKDsj(instance, str, len);
+}
-- 
cgit v1.1