Update native libraries
This commit is contained in:
parent
25cf8d682b
commit
bc528d5d98
@ -8,7 +8,7 @@ echo "Compiling mbedtls"
|
|||||||
echo "Compiling zlib"
|
echo "Compiling zlib"
|
||||||
(cd zlib && CFLAGS=-fPIC ./configure --static && make)
|
(cd zlib && CFLAGS=-fPIC ./configure --static && make)
|
||||||
|
|
||||||
CXX="g++ -shared -fPIC -Wl,--wrap=memcpy -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
|
CXX="g++ -shared -fPIC -O3 -Wall -Werror -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/"
|
||||||
|
|
||||||
$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so mbedtls/library/libmbedcrypto.a
|
$CXX -Imbedtls/include src/main/c/NativeCipherImpl.cpp -o src/main/resources/native-cipher.so mbedtls/library/libmbedcrypto.a
|
||||||
$CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so zlib/libz.a
|
$CXX -Izlib src/main/c/NativeCompressImpl.cpp -o src/main/resources/native-compress.so zlib/libz.a
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8c89224991adff88d53cd380f42a2baa36f91454
|
Subproject commit 2ca6c285a0dd3f33982dd57299012dacab1ff206
|
@ -4,12 +4,6 @@
|
|||||||
#include <mbedtls/aes.h>
|
#include <mbedtls/aes.h>
|
||||||
#include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h"
|
#include "net_md_5_bungee_jni_cipher_NativeCipherImpl.h"
|
||||||
|
|
||||||
// Support for CentOS 6
|
|
||||||
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
|
|
||||||
extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) {
|
|
||||||
return memcpy(dest, src, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef unsigned char byte;
|
typedef unsigned char byte;
|
||||||
|
|
||||||
struct crypto_context {
|
struct crypto_context {
|
||||||
|
@ -4,12 +4,6 @@
|
|||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
#include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h"
|
#include "net_md_5_bungee_jni_zlib_NativeCompressImpl.h"
|
||||||
|
|
||||||
// Support for CentOS 6
|
|
||||||
__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
|
|
||||||
extern "C" void *__wrap_memcpy(void *dest, const void *src, size_t n) {
|
|
||||||
return memcpy(dest, src, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef unsigned char byte;
|
typedef unsigned char byte;
|
||||||
|
|
||||||
static jfieldID consumedID;
|
static jfieldID consumedID;
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
Subproject commit 4e4e4c4fbdad9dd034d8f05e2312bf845f0d4d15
|
Subproject commit 92530568d2c128b4432467b76a3b54d93d6350bd
|
Loading…
Reference in New Issue
Block a user