[Android] jni: move all compat code in compat folder
Thomas Guillem
git at videolan.org
Tue Nov 25 08:57:53 CET 2014
vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov 24 16:27:56 2014 +0100| [bc2a336449d39e9dd105880e2b677f3a9a6854e4] | committer: Thomas Guillem
jni: move all compat code in compat folder
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=bc2a336449d39e9dd105880e2b677f3a9a6854e4
---
libvlc/jni/Android.mk | 63 ++++++++++++++-------------
libvlc/jni/{ => compat}/eventfd.c | 0
libvlc/jni/{ => compat}/pipe2.c | 0
libvlc/jni/{ => compat}/pthread-condattr.c | 0
libvlc/jni/{ => compat}/pthread-once.c | 0
libvlc/jni/{ => compat}/pthread-rwlocks.c | 0
libvlc/jni/{ => compat}/sem.c | 0
libvlc/jni/{ => compat}/wchar/wcpcpy.c | 0
libvlc/jni/{ => compat}/wchar/wcpncpy.c | 0
libvlc/jni/{ => compat}/wchar/wcscasecmp.c | 0
libvlc/jni/{ => compat}/wchar/wcscat.c | 0
libvlc/jni/{ => compat}/wchar/wcschr.c | 0
libvlc/jni/{ => compat}/wchar/wcscmp.c | 0
libvlc/jni/{ => compat}/wchar/wcscoll.c | 0
libvlc/jni/{ => compat}/wchar/wcscpy.c | 0
libvlc/jni/{ => compat}/wchar/wcscspn.c | 0
libvlc/jni/{ => compat}/wchar/wcsdup.c | 0
libvlc/jni/{ => compat}/wchar/wcslcat.c | 0
libvlc/jni/{ => compat}/wchar/wcslcpy.c | 0
libvlc/jni/{ => compat}/wchar/wcslen.c | 0
libvlc/jni/{ => compat}/wchar/wcsncasecmp.c | 0
libvlc/jni/{ => compat}/wchar/wcsncat.c | 0
libvlc/jni/{ => compat}/wchar/wcsncmp.c | 0
libvlc/jni/{ => compat}/wchar/wcsncpy.c | 0
libvlc/jni/{ => compat}/wchar/wcsnlen.c | 0
libvlc/jni/{ => compat}/wchar/wcspbrk.c | 0
libvlc/jni/{ => compat}/wchar/wcsrchr.c | 0
libvlc/jni/{ => compat}/wchar/wcsspn.c | 0
libvlc/jni/{ => compat}/wchar/wcsstr.c | 0
libvlc/jni/{ => compat}/wchar/wcstok.c | 0
libvlc/jni/{ => compat}/wchar/wcswidth.c | 0
libvlc/jni/{ => compat}/wchar/wcsxfrm.c | 0
libvlc/jni/{ => compat}/wchar/wmemchr.c | 0
libvlc/jni/{ => compat}/wchar/wmemcmp.c | 0
libvlc/jni/{ => compat}/wchar/wmemcpy.c | 0
libvlc/jni/{ => compat}/wchar/wmemmove.c | 0
libvlc/jni/{ => compat}/wchar/wmemset.c | 0
37 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/libvlc/jni/Android.mk b/libvlc/jni/Android.mk
index 3d09bee..9602ab4 100644
--- a/libvlc/jni/Android.mk
+++ b/libvlc/jni/Android.mk
@@ -7,38 +7,39 @@ LOCAL_SRC_FILES := libvlcjni.c libvlcjni-util.c libvlcjni-track.c libvlcjni-medi
LOCAL_SRC_FILES += thumbnailer.c
ifneq ($(ANDROID_API),android-21)
# compat functions not needed after android-21
-LOCAL_SRC_FILES += pthread-condattr.c pthread-rwlocks.c pthread-once.c eventfd.c sem.c pipe2.c
+LOCAL_SRC_FILES += compat/pthread-condattr.c compat/pthread-rwlocks.c
+LOCAL_SRC_FILES += compat/pthread-once.c compat/eventfd.c compat/sem.c compat/pipe2.c
endif
-LOCAL_SRC_FILES += wchar/wcpcpy.c
-LOCAL_SRC_FILES += wchar/wcpncpy.c
-LOCAL_SRC_FILES += wchar/wcscasecmp.c
-LOCAL_SRC_FILES += wchar/wcscat.c
-LOCAL_SRC_FILES += wchar/wcschr.c
-LOCAL_SRC_FILES += wchar/wcscmp.c
-LOCAL_SRC_FILES += wchar/wcscoll.c
-LOCAL_SRC_FILES += wchar/wcscpy.c
-LOCAL_SRC_FILES += wchar/wcscspn.c
-LOCAL_SRC_FILES += wchar/wcsdup.c
-LOCAL_SRC_FILES += wchar/wcslcat.c
-LOCAL_SRC_FILES += wchar/wcslcpy.c
-LOCAL_SRC_FILES += wchar/wcslen.c
-LOCAL_SRC_FILES += wchar/wcsncasecmp.c
-LOCAL_SRC_FILES += wchar/wcsncat.c
-LOCAL_SRC_FILES += wchar/wcsncmp.c
-LOCAL_SRC_FILES += wchar/wcsncpy.c
-LOCAL_SRC_FILES += wchar/wcsnlen.c
-LOCAL_SRC_FILES += wchar/wcspbrk.c
-LOCAL_SRC_FILES += wchar/wcsrchr.c
-LOCAL_SRC_FILES += wchar/wcsspn.c
-LOCAL_SRC_FILES += wchar/wcsstr.c
-LOCAL_SRC_FILES += wchar/wcstok.c
-LOCAL_SRC_FILES += wchar/wcswidth.c
-LOCAL_SRC_FILES += wchar/wcsxfrm.c
-LOCAL_SRC_FILES += wchar/wmemchr.c
-LOCAL_SRC_FILES += wchar/wmemcmp.c
-LOCAL_SRC_FILES += wchar/wmemcpy.c
-LOCAL_SRC_FILES += wchar/wmemmove.c
-LOCAL_SRC_FILES += wchar/wmemset.c
+LOCAL_SRC_FILES += compat/wchar/wcpcpy.c
+LOCAL_SRC_FILES += compat/wchar/wcpncpy.c
+LOCAL_SRC_FILES += compat/wchar/wcscasecmp.c
+LOCAL_SRC_FILES += compat/wchar/wcscat.c
+LOCAL_SRC_FILES += compat/wchar/wcschr.c
+LOCAL_SRC_FILES += compat/wchar/wcscmp.c
+LOCAL_SRC_FILES += compat/wchar/wcscoll.c
+LOCAL_SRC_FILES += compat/wchar/wcscpy.c
+LOCAL_SRC_FILES += compat/wchar/wcscspn.c
+LOCAL_SRC_FILES += compat/wchar/wcsdup.c
+LOCAL_SRC_FILES += compat/wchar/wcslcat.c
+LOCAL_SRC_FILES += compat/wchar/wcslcpy.c
+LOCAL_SRC_FILES += compat/wchar/wcslen.c
+LOCAL_SRC_FILES += compat/wchar/wcsncasecmp.c
+LOCAL_SRC_FILES += compat/wchar/wcsncat.c
+LOCAL_SRC_FILES += compat/wchar/wcsncmp.c
+LOCAL_SRC_FILES += compat/wchar/wcsncpy.c
+LOCAL_SRC_FILES += compat/wchar/wcsnlen.c
+LOCAL_SRC_FILES += compat/wchar/wcspbrk.c
+LOCAL_SRC_FILES += compat/wchar/wcsrchr.c
+LOCAL_SRC_FILES += compat/wchar/wcsspn.c
+LOCAL_SRC_FILES += compat/wchar/wcsstr.c
+LOCAL_SRC_FILES += compat/wchar/wcstok.c
+LOCAL_SRC_FILES += compat/wchar/wcswidth.c
+LOCAL_SRC_FILES += compat/wchar/wcsxfrm.c
+LOCAL_SRC_FILES += compat/wchar/wmemchr.c
+LOCAL_SRC_FILES += compat/wchar/wmemcmp.c
+LOCAL_SRC_FILES += compat/wchar/wmemcpy.c
+LOCAL_SRC_FILES += compat/wchar/wmemmove.c
+LOCAL_SRC_FILES += compat/wchar/wmemset.c
LOCAL_C_INCLUDES := $(VLC_SRC_DIR)/include
diff --git a/libvlc/jni/eventfd.c b/libvlc/jni/compat/eventfd.c
similarity index 100%
rename from libvlc/jni/eventfd.c
rename to libvlc/jni/compat/eventfd.c
diff --git a/libvlc/jni/pipe2.c b/libvlc/jni/compat/pipe2.c
similarity index 100%
rename from libvlc/jni/pipe2.c
rename to libvlc/jni/compat/pipe2.c
diff --git a/libvlc/jni/pthread-condattr.c b/libvlc/jni/compat/pthread-condattr.c
similarity index 100%
rename from libvlc/jni/pthread-condattr.c
rename to libvlc/jni/compat/pthread-condattr.c
diff --git a/libvlc/jni/pthread-once.c b/libvlc/jni/compat/pthread-once.c
similarity index 100%
rename from libvlc/jni/pthread-once.c
rename to libvlc/jni/compat/pthread-once.c
diff --git a/libvlc/jni/pthread-rwlocks.c b/libvlc/jni/compat/pthread-rwlocks.c
similarity index 100%
rename from libvlc/jni/pthread-rwlocks.c
rename to libvlc/jni/compat/pthread-rwlocks.c
diff --git a/libvlc/jni/sem.c b/libvlc/jni/compat/sem.c
similarity index 100%
rename from libvlc/jni/sem.c
rename to libvlc/jni/compat/sem.c
diff --git a/libvlc/jni/wchar/wcpcpy.c b/libvlc/jni/compat/wchar/wcpcpy.c
similarity index 100%
rename from libvlc/jni/wchar/wcpcpy.c
rename to libvlc/jni/compat/wchar/wcpcpy.c
diff --git a/libvlc/jni/wchar/wcpncpy.c b/libvlc/jni/compat/wchar/wcpncpy.c
similarity index 100%
rename from libvlc/jni/wchar/wcpncpy.c
rename to libvlc/jni/compat/wchar/wcpncpy.c
diff --git a/libvlc/jni/wchar/wcscasecmp.c b/libvlc/jni/compat/wchar/wcscasecmp.c
similarity index 100%
rename from libvlc/jni/wchar/wcscasecmp.c
rename to libvlc/jni/compat/wchar/wcscasecmp.c
diff --git a/libvlc/jni/wchar/wcscat.c b/libvlc/jni/compat/wchar/wcscat.c
similarity index 100%
rename from libvlc/jni/wchar/wcscat.c
rename to libvlc/jni/compat/wchar/wcscat.c
diff --git a/libvlc/jni/wchar/wcschr.c b/libvlc/jni/compat/wchar/wcschr.c
similarity index 100%
rename from libvlc/jni/wchar/wcschr.c
rename to libvlc/jni/compat/wchar/wcschr.c
diff --git a/libvlc/jni/wchar/wcscmp.c b/libvlc/jni/compat/wchar/wcscmp.c
similarity index 100%
rename from libvlc/jni/wchar/wcscmp.c
rename to libvlc/jni/compat/wchar/wcscmp.c
diff --git a/libvlc/jni/wchar/wcscoll.c b/libvlc/jni/compat/wchar/wcscoll.c
similarity index 100%
rename from libvlc/jni/wchar/wcscoll.c
rename to libvlc/jni/compat/wchar/wcscoll.c
diff --git a/libvlc/jni/wchar/wcscpy.c b/libvlc/jni/compat/wchar/wcscpy.c
similarity index 100%
rename from libvlc/jni/wchar/wcscpy.c
rename to libvlc/jni/compat/wchar/wcscpy.c
diff --git a/libvlc/jni/wchar/wcscspn.c b/libvlc/jni/compat/wchar/wcscspn.c
similarity index 100%
rename from libvlc/jni/wchar/wcscspn.c
rename to libvlc/jni/compat/wchar/wcscspn.c
diff --git a/libvlc/jni/wchar/wcsdup.c b/libvlc/jni/compat/wchar/wcsdup.c
similarity index 100%
rename from libvlc/jni/wchar/wcsdup.c
rename to libvlc/jni/compat/wchar/wcsdup.c
diff --git a/libvlc/jni/wchar/wcslcat.c b/libvlc/jni/compat/wchar/wcslcat.c
similarity index 100%
rename from libvlc/jni/wchar/wcslcat.c
rename to libvlc/jni/compat/wchar/wcslcat.c
diff --git a/libvlc/jni/wchar/wcslcpy.c b/libvlc/jni/compat/wchar/wcslcpy.c
similarity index 100%
rename from libvlc/jni/wchar/wcslcpy.c
rename to libvlc/jni/compat/wchar/wcslcpy.c
diff --git a/libvlc/jni/wchar/wcslen.c b/libvlc/jni/compat/wchar/wcslen.c
similarity index 100%
rename from libvlc/jni/wchar/wcslen.c
rename to libvlc/jni/compat/wchar/wcslen.c
diff --git a/libvlc/jni/wchar/wcsncasecmp.c b/libvlc/jni/compat/wchar/wcsncasecmp.c
similarity index 100%
rename from libvlc/jni/wchar/wcsncasecmp.c
rename to libvlc/jni/compat/wchar/wcsncasecmp.c
diff --git a/libvlc/jni/wchar/wcsncat.c b/libvlc/jni/compat/wchar/wcsncat.c
similarity index 100%
rename from libvlc/jni/wchar/wcsncat.c
rename to libvlc/jni/compat/wchar/wcsncat.c
diff --git a/libvlc/jni/wchar/wcsncmp.c b/libvlc/jni/compat/wchar/wcsncmp.c
similarity index 100%
rename from libvlc/jni/wchar/wcsncmp.c
rename to libvlc/jni/compat/wchar/wcsncmp.c
diff --git a/libvlc/jni/wchar/wcsncpy.c b/libvlc/jni/compat/wchar/wcsncpy.c
similarity index 100%
rename from libvlc/jni/wchar/wcsncpy.c
rename to libvlc/jni/compat/wchar/wcsncpy.c
diff --git a/libvlc/jni/wchar/wcsnlen.c b/libvlc/jni/compat/wchar/wcsnlen.c
similarity index 100%
rename from libvlc/jni/wchar/wcsnlen.c
rename to libvlc/jni/compat/wchar/wcsnlen.c
diff --git a/libvlc/jni/wchar/wcspbrk.c b/libvlc/jni/compat/wchar/wcspbrk.c
similarity index 100%
rename from libvlc/jni/wchar/wcspbrk.c
rename to libvlc/jni/compat/wchar/wcspbrk.c
diff --git a/libvlc/jni/wchar/wcsrchr.c b/libvlc/jni/compat/wchar/wcsrchr.c
similarity index 100%
rename from libvlc/jni/wchar/wcsrchr.c
rename to libvlc/jni/compat/wchar/wcsrchr.c
diff --git a/libvlc/jni/wchar/wcsspn.c b/libvlc/jni/compat/wchar/wcsspn.c
similarity index 100%
rename from libvlc/jni/wchar/wcsspn.c
rename to libvlc/jni/compat/wchar/wcsspn.c
diff --git a/libvlc/jni/wchar/wcsstr.c b/libvlc/jni/compat/wchar/wcsstr.c
similarity index 100%
rename from libvlc/jni/wchar/wcsstr.c
rename to libvlc/jni/compat/wchar/wcsstr.c
diff --git a/libvlc/jni/wchar/wcstok.c b/libvlc/jni/compat/wchar/wcstok.c
similarity index 100%
rename from libvlc/jni/wchar/wcstok.c
rename to libvlc/jni/compat/wchar/wcstok.c
diff --git a/libvlc/jni/wchar/wcswidth.c b/libvlc/jni/compat/wchar/wcswidth.c
similarity index 100%
rename from libvlc/jni/wchar/wcswidth.c
rename to libvlc/jni/compat/wchar/wcswidth.c
diff --git a/libvlc/jni/wchar/wcsxfrm.c b/libvlc/jni/compat/wchar/wcsxfrm.c
similarity index 100%
rename from libvlc/jni/wchar/wcsxfrm.c
rename to libvlc/jni/compat/wchar/wcsxfrm.c
diff --git a/libvlc/jni/wchar/wmemchr.c b/libvlc/jni/compat/wchar/wmemchr.c
similarity index 100%
rename from libvlc/jni/wchar/wmemchr.c
rename to libvlc/jni/compat/wchar/wmemchr.c
diff --git a/libvlc/jni/wchar/wmemcmp.c b/libvlc/jni/compat/wchar/wmemcmp.c
similarity index 100%
rename from libvlc/jni/wchar/wmemcmp.c
rename to libvlc/jni/compat/wchar/wmemcmp.c
diff --git a/libvlc/jni/wchar/wmemcpy.c b/libvlc/jni/compat/wchar/wmemcpy.c
similarity index 100%
rename from libvlc/jni/wchar/wmemcpy.c
rename to libvlc/jni/compat/wchar/wmemcpy.c
diff --git a/libvlc/jni/wchar/wmemmove.c b/libvlc/jni/compat/wchar/wmemmove.c
similarity index 100%
rename from libvlc/jni/wchar/wmemmove.c
rename to libvlc/jni/compat/wchar/wmemmove.c
diff --git a/libvlc/jni/wchar/wmemset.c b/libvlc/jni/compat/wchar/wmemset.c
similarity index 100%
rename from libvlc/jni/wchar/wmemset.c
rename to libvlc/jni/compat/wchar/wmemset.c
More information about the Android
mailing list