mirror of https://github.com/NekoX-Dev/NekoX.git
Update libraries
This commit is contained in:
parent
406c9cd44d
commit
860f8a364b
|
@ -59,7 +59,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'cn.hutool:hutool-all:5.3.10'
|
classpath 'cn.hutool:hutool-all:5.4.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -104,8 +104,8 @@ dependencies {
|
||||||
implementation 'dnsjava:dnsjava:3.2.2'
|
implementation 'dnsjava:dnsjava:3.2.2'
|
||||||
implementation 'org.dizitart:nitrite:3.4.2'
|
implementation 'org.dizitart:nitrite:3.4.2'
|
||||||
|
|
||||||
implementation 'cn.hutool:hutool-core:5.3.10'
|
implementation 'cn.hutool:hutool-core:5.4.0'
|
||||||
implementation 'cn.hutool:hutool-crypto:5.3.10'
|
implementation 'cn.hutool:hutool-crypto:5.4.0'
|
||||||
|
|
||||||
implementation project(":openpgp-api")
|
implementation project(":openpgp-api")
|
||||||
|
|
||||||
|
|
|
@ -131,7 +131,7 @@ endif
|
||||||
|
|
||||||
include $(PREBUILT_STATIC_LIBRARY)
|
include $(PREBUILT_STATIC_LIBRARY)
|
||||||
|
|
||||||
include ./jni/TgCalls.mk
|
include $(LOCAL_PATH)/TgCalls.mk
|
||||||
|
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_CPPFLAGS := -Wall -std=c++14 -DANDROID -frtti -DHAVE_PTHREAD -finline-functions -ffast-math -Os
|
LOCAL_CPPFLAGS := -Wall -std=c++14 -DANDROID -frtti -DHAVE_PTHREAD -finline-functions -ffast-math -Os
|
||||||
|
@ -519,7 +519,7 @@ $(LOCAL_PATH)/exoplayer/libFLAC/include \
|
||||||
$(LOCAL_PATH)/intro \
|
$(LOCAL_PATH)/intro \
|
||||||
$(LOCAL_PATH)/rlottie/inc \
|
$(LOCAL_PATH)/rlottie/inc \
|
||||||
$(LOCAL_PATH)/tgcalls/ \
|
$(LOCAL_PATH)/tgcalls/ \
|
||||||
./jni/webrtc/ \
|
$(LOCAL_PATH)/webrtc/ \
|
||||||
$(LOCAL_PATH)/lz4
|
$(LOCAL_PATH)/lz4
|
||||||
|
|
||||||
LOCAL_SRC_FILES += \
|
LOCAL_SRC_FILES += \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 251b5169fd44345f455438312ec4e18ae07fd58c
|
Subproject commit 9372f38cd06d181e8c9badf34d0d733670f282cc
|
|
@ -1 +1 @@
|
||||||
Subproject commit 799fc4d732fc2515911b75fe816da2bbd20221d9
|
Subproject commit f9f95ceebfbd7b7f43c1b7ad34e25d366e6e2d2b
|
|
@ -3,4 +3,4 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
patch -d boringssl -p1 < patches/boringssl/0001-add-aes-ige-mode.patch
|
patch -d boringssl -p1 < patches/boringssl/0001-add-aes-ige-mode.patch
|
||||||
# patch -d boringssl -p1 < patches/boringssl/0001-only-build-what-we-need.patch
|
patch -d boringssl -p1 < patches/boringssl/0001-only-build-what-we-need.patch
|
||||||
|
|
|
@ -6,13 +6,14 @@ Subject: [PATCH] only build what we need
|
||||||
---
|
---
|
||||||
CMakeLists.txt | 36 ---------------------
|
CMakeLists.txt | 36 ---------------------
|
||||||
crypto/CMakeLists.txt | 74 -------------------------------------------
|
crypto/CMakeLists.txt | 74 -------------------------------------------
|
||||||
2 files changed, 110 deletions(-)
|
ssl/CMakeLists.txt | 18 ------------------
|
||||||
|
3 files changed, 128 deletions(-)
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index fd3532664..7fcfb1627 100644
|
index fd3532664..7fcfb1627 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -542,33 +542,7 @@ if(USE_CUSTOM_LIBCXX)
|
@@ -562,44 +562,8 @@ if(USE_CUSTOM_LIBCXX)
|
||||||
target_link_libraries(libcxx libcxxabi)
|
target_link_libraries(libcxx libcxxabi)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -27,17 +28,28 @@ index fd3532664..7fcfb1627 100644
|
||||||
-# themselves as dependencies next to the target definition.
|
-# themselves as dependencies next to the target definition.
|
||||||
-add_custom_target(all_tests)
|
-add_custom_target(all_tests)
|
||||||
-
|
-
|
||||||
|
-# On Windows, CRYPTO_TEST_DATA is too long to fit in command-line limits.
|
||||||
|
-# TODO(davidben): CMake 3.12 has a list(JOIN) command. Use that when we've
|
||||||
|
-# updated the minimum version.
|
||||||
|
-set(EMBED_TEST_DATA_ARGS "")
|
||||||
|
-foreach(arg ${CRYPTO_TEST_DATA})
|
||||||
|
- set(EMBED_TEST_DATA_ARGS "${EMBED_TEST_DATA_ARGS}${arg}\n")
|
||||||
|
-endforeach()
|
||||||
|
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt"
|
||||||
|
- "${EMBED_TEST_DATA_ARGS}")
|
||||||
|
-
|
||||||
-add_custom_command(
|
-add_custom_command(
|
||||||
- OUTPUT crypto_test_data.cc
|
- OUTPUT crypto_test_data.cc
|
||||||
- COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go ${CRYPTO_TEST_DATA} >
|
- COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go -file-list
|
||||||
- ${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc
|
- "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt" >
|
||||||
|
- "${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc"
|
||||||
- DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA}
|
- DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA}
|
||||||
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
-
|
-
|
||||||
-add_library(crypto_test_data OBJECT crypto_test_data.cc)
|
-add_library(crypto_test_data OBJECT crypto_test_data.cc)
|
||||||
-
|
-
|
||||||
add_subdirectory(crypto)
|
add_subdirectory(crypto)
|
||||||
-add_subdirectory(ssl)
|
add_subdirectory(ssl)
|
||||||
-add_subdirectory(ssl/test)
|
-add_subdirectory(ssl/test)
|
||||||
-add_subdirectory(tool)
|
-add_subdirectory(tool)
|
||||||
-add_subdirectory(util/fipstools/cavp)
|
-add_subdirectory(util/fipstools/cavp)
|
||||||
|
@ -73,7 +85,7 @@ index e940f7d5f..f5221d70d 100644
|
||||||
|
|
||||||
if(FIPS_DELOCATE)
|
if(FIPS_DELOCATE)
|
||||||
SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true)
|
SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true)
|
||||||
@@ -461,93 +461,3 @@ endif()
|
@@ -466,94 +466,3 @@ endif()
|
||||||
if(USE_CUSTOM_LIBCXX)
|
if(USE_CUSTOM_LIBCXX)
|
||||||
target_link_libraries(crypto libcxx)
|
target_link_libraries(crypto libcxx)
|
||||||
endif()
|
endif()
|
||||||
|
@ -131,6 +143,7 @@ index e940f7d5f..f5221d70d 100644
|
||||||
- fipsmodule/rand/fork_detect_test.cc
|
- fipsmodule/rand/fork_detect_test.cc
|
||||||
- fipsmodule/sha/sha_test.cc
|
- fipsmodule/sha/sha_test.cc
|
||||||
- hkdf/hkdf_test.cc
|
- hkdf/hkdf_test.cc
|
||||||
|
- hpke/hpke_test.cc
|
||||||
- hmac_extra/hmac_test.cc
|
- hmac_extra/hmac_test.cc
|
||||||
- hrss/hrss_test.cc
|
- hrss/hrss_test.cc
|
||||||
- impl_dispatch_test.cc
|
- impl_dispatch_test.cc
|
||||||
|
@ -167,6 +180,32 @@ index e940f7d5f..f5221d70d 100644
|
||||||
- target_link_libraries(crypto_test ws2_32)
|
- target_link_libraries(crypto_test ws2_32)
|
||||||
-endif()
|
-endif()
|
||||||
-add_dependencies(all_tests crypto_test)
|
-add_dependencies(all_tests crypto_test)
|
||||||
|
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
|
||||||
|
index 0fb532eae..f5cab9807 100644
|
||||||
|
--- a/ssl/CMakeLists.txt
|
||||||
|
+++ b/ssl/CMakeLists.txt
|
||||||
|
@@ -44,21 +44,3 @@ add_library(
|
||||||
|
add_dependencies(ssl global_target)
|
||||||
|
|
||||||
|
target_link_libraries(ssl crypto)
|
||||||
|
-
|
||||||
|
-add_executable(
|
||||||
|
- ssl_test
|
||||||
|
-
|
||||||
|
- span_test.cc
|
||||||
|
- ssl_test.cc
|
||||||
|
- ssl_c_test.c
|
||||||
|
-
|
||||||
|
- $<TARGET_OBJECTS:boringssl_gtest_main>
|
||||||
|
-)
|
||||||
|
-
|
||||||
|
-add_dependencies(ssl_test global_target)
|
||||||
|
-
|
||||||
|
-target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto)
|
||||||
|
-if(WIN32)
|
||||||
|
- target_link_libraries(ssl_test ws2_32)
|
||||||
|
-endif()
|
||||||
|
-add_dependencies(all_tests ssl_test)
|
||||||
--
|
--
|
||||||
2.20.1
|
2.20.1
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,8 @@
|
||||||
|
|
||||||
function assemble() {
|
function assemble() {
|
||||||
|
|
||||||
./gradlew TMessagesProj:assembleFullRelease \
|
./gradlew TMessagesProj:assembleRelease \
|
||||||
TMessagesProj:assembleFullReleaseNoGcm \
|
TMessagesProj:assembleReleaseNoGcm
|
||||||
TMessagesProj:assembleMiniRelease \
|
|
||||||
TMessagesProj:assembleMiniReleaseNoGcm \
|
|
||||||
TMessagesProj:assembleMiniNoEmojiReleaseNoGcm
|
|
||||||
|
|
||||||
return $?
|
return $?
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
RELEASE_KEY_PASSWORD=android
|
RELEASE_KEY_PASSWORD=android
|
||||||
RELEASE_KEY_ALIAS=androidkey
|
RELEASE_KEY_ALIAS=androidkey
|
||||||
RELEASE_STORE_PASSWORD=android
|
RELEASE_STORE_PASSWORD=android
|
||||||
org.gradle.jvmargs=-Xmx4096M -XX:MaxPermSize=4096m
|
org.gradle.jvmargs=-Xmx16384M -XX:MaxPermSize=16384m
|
||||||
org.gradle.daemon=true
|
org.gradle.daemon=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.configureondemand=false
|
org.gradle.configureondemand=false
|
||||||
|
|
Loading…
Reference in New Issue