Skip to content

Commit eb4e1a7

Browse files
committed
Upgrade webp to webmproject/libwebp@801d2be + Bundle libwebp in all build variants + Force bundled libwebp on all Android versions
1 parent aeb3b7a commit eb4e1a7

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

‎app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ android {
109109
dimension = "abi"
110110
versionCode = (abi + 1)
111111
minSdk = variant.minSdkVersion
112-
buildConfigBool("WEBP_ENABLED", variant.minSdkVersion < 19)
112+
buildConfigBool("WEBP_ENABLED", true) // variant.minSdkVersion < 19
113113
buildConfigBool("SIDE_LOAD_ONLY", variant.sideLoadOnly)
114114
ndk.abiFilters.clear()
115115
ndk.abiFilters.addAll(variant.filters)

‎app/jni/CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ set(UTILS_DIR "${THIRDPARTY_DIR}/jni-utils")
1818
set(ENABLE_TG_CALLS yes)
1919

2020
# Using webp only if building for 32-bit platform
21-
if (${ANDROID_ABI} STREQUAL "armeabi-v7a" OR ${ANDROID_ABI} STREQUAL "x86")
22-
set(USE_WEBP yes)
23-
else()
24-
set(USE_WEBP no)
25-
endif()
21+
#if (${ANDROID_ABI} STREQUAL "armeabi-v7a" OR ${ANDROID_ABI} STREQUAL "x86")
22+
# set(USE_WEBP yes)
23+
#else()
24+
# set(USE_WEBP no)
25+
#endif()
26+
set(USE_WEBP yes)
2627

2728
if (${ANDROID_ABI} STREQUAL "x86_64" OR ${ANDROID_ABI} STREQUAL "arm64-v8a")
2829
set(FFMPEG_ABI ${ANDROID_ABI})

0 commit comments

Comments
 (0)