fix libwebsockets android arm64 build issue and delete gafplayer

Author: zilongshanren

build/android.ini

@@ -8,7 +8,7 @@ cfg_default_build_api=9
 cfg_default_gcc_version=4.9
 cfg_arm_alias_folder_name="armeabi"
 cfg_armv7_alias_folder_name="armeabi-v7a"
-cfg_arm64_alias_folder_name="armeabi-v8a"
+cfg_arm64_alias_folder_name="arm64-v8a"
 #specific the STL version, currently only clang and gnu is supported
 cfg_default_build_stl="gnu"  #clang is another option
 

contrib/bootstrap

@@ -229,14 +229,14 @@ check_android_sdk()
         ## FIXME: the android toolchain path is hardcoded, only MACOSX will work.
         if [ ${ANDROID_ABI} = "x86" ]; then
             toolchain_path_prefix=x86
-        elif [ ${ANDROID_ABI} = "armeabi-v8a" ];then
+        elif [ ${ANDROID_ABI} = "arm64-v8a" ];then
             toolchain_path_prefix=aarch64-linux-android
         else
             toolchain_path_prefix=arm-linux-androideabi
         fi
 
         # check whether sysroot is exists
-        if [ $ANDROID_ABI = "armeabi-v8a" ]; then
+        if [ $ANDROID_ABI = "arm64-v8a" ]; then
             if [ ! -d ${ANDROID_NDK}/platforms/${ANDROID_API}/arch-arm64 ];then
                 echo "${ANDROID_NDK} ${ANDROID_API} doesn't support build arm64 architecture!"
                 exit $? 
@@ -268,7 +268,7 @@ check_android_sdk()
             add_make "EXTRA_CFLAGS := -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes  -march=armv5te -mtune=xscale -msoft-float ${THUMB_FLAG} -fomit-frame-pointer -fno-strict-aliasing -DANDROID  -Wa,--noexecstack -Wformat "
         fi
 
-	if [ ${ANDROID_ABI} = "armeabi-v8a" ]; then
+	if [ ${ANDROID_ABI} = "arm64-v8a" ]; then
             add_make_enabled "HAVE_NEON"
             add_make_enabled "HAVE_ARMV8A"
             add_make "EXTRA_CFLAGS :=  -fpic -ffunction-sections  -funwind-tables  -fstack-protector  -no-canonical-prefixes"

contrib/src/gafplayer/rules.mak

@@ -0,0 +1,41 @@
+diff --git a/lib/context.c b/lib/context.c
+index f2f30ad..2b04f36 100755
+--- a/lib/context.c
++++ b/lib/context.c
+@@ -123,7 +123,12 @@ libwebsocket_create_context(struct lws_context_creation_info *info)
+ 	context->options = info->options;
+ 	context->iface = info->iface;
+ 	/* to reduce this allocation, */
+-	context->max_fds = getdtablesize();
++	//context->max_fds = getdtablesize();
++    context->max_fds = OPEN_MAX;
++    struct rlimit rl;
++    if (getrlimit(RLIMIT_NOFILE, &rl) != -1) {
++        context->max_fds = rl.rlim_cur;
++    }
+ 	lwsl_notice(" static allocation: %u + (%u x %u fds) = %u bytes\n",
+ 		sizeof(struct libwebsocket_context),
+ 		sizeof(struct libwebsocket_pollfd) +
+diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
+index 6fae889..c1aac6f 100755
+--- a/lib/private-libwebsockets.h
++++ b/lib/private-libwebsockets.h
+@@ -42,6 +42,7 @@
+ #include <ctype.h>
+ #include <limits.h>
+ #include <stdarg.h>
++#include <sys/resource.h>
+ 
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+@@ -145,8 +146,10 @@
+ #endif
+ 
+ #ifndef HAVE_BZERO
++#ifndef bzero
+ #define bzero(b, len) (memset((b), '\0', (len)), (void) 0)
+ #endif
++#endif
+ 
+ #ifndef HAVE_STRERROR
+ #define strerror(x) ""

contrib/src/websockets/android-arm64.patch

@@ -12,6 +12,9 @@ websockets: libwebsockets-1.3-chrome37-firefox30.zip .sum-websockets
 	$(UNPACK)
 ifdef HAVE_ANDROID
 	$(APPLY) $(SRC)/websockets/websocket_android.patch
+ifeq ($(MY_TARGET_ARCH),arm64-v8a)
+	$(APPLY) $(SRC)/websockets/android-arm64.patch
+endif
 endif
 	$(MOVE)
 
@@ -23,6 +26,6 @@ endif
 DEPS_websockets = zlib $(DEPS_zlib)
 
 .websockets: websockets .zlib toolchain.cmake
-	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(EX_ECFLAGS)" $(CMAKE) -DLWS_WITH_SSL=0 -DLWS_WITHOUT_TEST_PING=1 -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=1
 	cd $< && $(MAKE) VERBOSE=1 install
 	touch $@