Skip to content

Commit 28ca394

Browse files
committed
Feat: Update liblzma and fix missing config
1 parent 9a62804 commit 28ca394

3 files changed

Lines changed: 122 additions & 87 deletions

File tree

library/CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ target_include_directories(bz
5757

5858
# https://github.com/tukaani-project/xz/blob/master/configure.ac
5959
function(configure_liblzma)
60+
if(CMAKE_ANDROID_ARCH_ABI STREQUAL "arm64-v8a")
61+
set(HAVE_ARM64_CRC32 1)
62+
endif()
6063
set(HAVE_BSWAP_16 1)
6164
set(HAVE_BSWAP_32 1)
6265
set(HAVE_BSWAP_64 1)
@@ -69,6 +72,9 @@ function(configure_liblzma)
6972
if(CMAKE_ANDROID_ARCH_ABI MATCHES "x86|x86_64")
7073
set(HAVE_CPUID_H 1)
7174
endif()
75+
if(CMAKE_ANDROID_ARCH_ABI STREQUAL "x86")
76+
set(HAVE_CRC_X86_ASM 1)
77+
endif()
7278
set(HAVE_DECODERS 1)
7379
set(HAVE_DECODER_ARM 1)
7480
set(HAVE_DECODER_ARM64 1)
@@ -78,6 +84,7 @@ function(configure_liblzma)
7884
set(HAVE_DECODER_LZMA1 1)
7985
set(HAVE_DECODER_LZMA2 1)
8086
set(HAVE_DECODER_POWERPC 1)
87+
set(HAVE_DECODER_RISCV 1)
8188
set(HAVE_DECODER_SPARC 1)
8289
set(HAVE_DECODER_X86 1)
8390
set(HAVE_ENCODERS 1)
@@ -89,9 +96,12 @@ function(configure_liblzma)
8996
set(HAVE_ENCODER_LZMA1 1)
9097
set(HAVE_ENCODER_LZMA2 1)
9198
set(HAVE_ENCODER_POWERPC 1)
99+
set(HAVE_ENCODER_RISCV 1)
92100
set(HAVE_ENCODER_SPARC 1)
93101
set(HAVE_ENCODER_X86 1)
94102
set(HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1)
103+
set(HAVE_GETAUXVAL 1)
104+
set(HAVE_HWCAP_CRC32 1)
95105
if(CMAKE_ANDROID_ARCH_ABI MATCHES "x86|x86_64")
96106
set(HAVE_IMMINTRIN_H 1)
97107
endif()
@@ -263,6 +273,7 @@ target_compile_options(lzma
263273
-Wdocumentation
264274
-Wduplicate-enum
265275
-Wempty-translation-unit
276+
-Wextra-semi-stmt
266277
-Wflexible-array-extensions
267278
-Wmissing-variable-declarations
268279
-Wnewline-eof

library/src/main/jni/external/xz

Submodule xz updated 73 files
Lines changed: 110 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,112 @@
1-
#cmakedefine ENABLE_NLS 1
2-
#cmakedefine HAVE_BSWAP_16 1
3-
#cmakedefine HAVE_BSWAP_32 1
4-
#cmakedefine HAVE_BSWAP_64 1
5-
#cmakedefine HAVE_BYTESWAP_H 1
6-
#cmakedefine HAVE_CC_SHA256_CTX 1
7-
#cmakedefine HAVE_CC_SHA256_INIT 1
8-
#cmakedefine HAVE_CHECK_CRC32 1
9-
#cmakedefine HAVE_CHECK_CRC64 1
10-
#cmakedefine HAVE_CHECK_SHA256 1
11-
#cmakedefine HAVE_CLOCK_GETTIME 1
12-
#cmakedefine HAVE_CLOCK_MONOTONIC 1
13-
#cmakedefine HAVE_COMMONCRYPTO_COMMONDIGEST_H 1
14-
#cmakedefine HAVE_CPUID_H 1
15-
#cmakedefine HAVE_DECODERS 1
16-
#cmakedefine HAVE_DECODER_ARM 1
17-
#cmakedefine HAVE_DECODER_ARM64 1
18-
#cmakedefine HAVE_DECODER_ARMTHUMB 1
19-
#cmakedefine HAVE_DECODER_DELTA 1
20-
#cmakedefine HAVE_DECODER_IA64 1
21-
#cmakedefine HAVE_DECODER_LZMA1 1
22-
#cmakedefine HAVE_DECODER_LZMA2 1
23-
#cmakedefine HAVE_DECODER_POWERPC 1
24-
#cmakedefine HAVE_DECODER_SPARC 1
25-
#cmakedefine HAVE_DECODER_X86 1
26-
#cmakedefine HAVE_ENCODERS 1
27-
#cmakedefine HAVE_ENCODER_ARM 1
28-
#cmakedefine HAVE_ENCODER_ARM64 1
29-
#cmakedefine HAVE_ENCODER_ARMTHUMB 1
30-
#cmakedefine HAVE_ENCODER_DELTA 1
31-
#cmakedefine HAVE_ENCODER_IA64 1
32-
#cmakedefine HAVE_ENCODER_LZMA1 1
33-
#cmakedefine HAVE_ENCODER_LZMA2 1
34-
#cmakedefine HAVE_ENCODER_POWERPC 1
35-
#cmakedefine HAVE_ENCODER_SPARC 1
36-
#cmakedefine HAVE_ENCODER_X86 1
37-
#cmakedefine HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1
38-
#cmakedefine HAVE_IMMINTRIN_H 1
39-
#cmakedefine HAVE_INTTYPES_H 1
40-
#cmakedefine HAVE_LZIP_DECODER 1
41-
#cmakedefine HAVE_MBRTOWC 1
42-
#cmakedefine HAVE_MF_BT2 1
43-
#cmakedefine HAVE_MF_BT3 1
44-
#cmakedefine HAVE_MF_BT4 1
45-
#cmakedefine HAVE_MF_HC3 1
46-
#cmakedefine HAVE_MF_HC4 1
47-
#cmakedefine HAVE_PROGRAM_INVOCATION_NAME 1
48-
#cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
49-
#cmakedefine HAVE_SHA256INIT 1
50-
#cmakedefine HAVE_SHA256_CTX 1
51-
#cmakedefine HAVE_SHA256_H 1
52-
#cmakedefine HAVE_SHA256_INIT 1
53-
#cmakedefine HAVE_SHA2_CTX 1
54-
#cmakedefine HAVE_SHA2_H 1
55-
#cmakedefine HAVE_SMALL 1
56-
#cmakedefine HAVE_STDBOOL_H 1
57-
#cmakedefine HAVE_STDINT_H 1
58-
#cmakedefine HAVE_SYMBOL_VERSIONS_LINUX 1
59-
#cmakedefine HAVE_SYS_BYTEORDER_H 1
60-
#cmakedefine HAVE_SYS_ENDIAN_H 1
61-
#cmakedefine HAVE_SYS_PARAM_H 1
62-
#cmakedefine HAVE_USABLE_CLMUL 1
63-
#cmakedefine HAVE_VISIBILITY 1
64-
#cmakedefine HAVE_WCWIDTH 1
65-
#cmakedefine HAVE__BOOL 1
66-
#cmakedefine HAVE__MM_MOVEMASK_EPI8 1
67-
#cmakedefine HAVE___BUILTIN_ASSUME_ALIGNED 1
68-
#cmakedefine HAVE___BUILTIN_BSWAPXX 1
69-
#cmakedefine MYTHREAD_POSIX 1
70-
#cmakedefine MYTHREAD_VISTA 1
71-
#cmakedefine MYTHREAD_WIN95 1
72-
#cmakedefine NDEBUG 1
1+
// ./autogen.sh; grep -oP '(?<=#undef ).*' config.h.in | grep -ho -f - -r src/{common,liblzma} | sort | uniq | grep -f - <(grep -oP '(?<=#undef ).*' config.h.in) | cat - <(echo _FILE_OFFSET_BITS) | sed 's/.*/#cmakedefine \0 @\0@/'
2+
#cmakedefine ENABLE_NLS @ENABLE_NLS@
3+
#cmakedefine HAVE_ARM64_CRC32 @HAVE_ARM64_CRC32@
4+
#cmakedefine HAVE_BSWAP_16 @HAVE_BSWAP_16@
5+
#cmakedefine HAVE_BSWAP_32 @HAVE_BSWAP_32@
6+
#cmakedefine HAVE_BSWAP_64 @HAVE_BSWAP_64@
7+
#cmakedefine HAVE_BYTESWAP_H @HAVE_BYTESWAP_H@
8+
#cmakedefine HAVE_CC_SHA256_CTX @HAVE_CC_SHA256_CTX@
9+
#cmakedefine HAVE_CC_SHA256_INIT @HAVE_CC_SHA256_INIT@
10+
#cmakedefine HAVE_CHECK_CRC32 @HAVE_CHECK_CRC32@
11+
#cmakedefine HAVE_CHECK_CRC64 @HAVE_CHECK_CRC64@
12+
#cmakedefine HAVE_CHECK_SHA256 @HAVE_CHECK_SHA256@
13+
#cmakedefine HAVE_CLOCK_GETTIME @HAVE_CLOCK_GETTIME@
14+
#cmakedefine HAVE_CLOCK_MONOTONIC @HAVE_CLOCK_MONOTONIC@
15+
#cmakedefine HAVE_COMMONCRYPTO_COMMONDIGEST_H @HAVE_COMMONCRYPTO_COMMONDIGEST_H@
16+
#cmakedefine HAVE_CPUID_H @HAVE_CPUID_H@
17+
#cmakedefine HAVE_CRC_X86_ASM @HAVE_CRC_X86_ASM@
18+
#cmakedefine HAVE_DECODER_ARM @HAVE_DECODER_ARM@
19+
#cmakedefine HAVE_DECODER_ARM64 @HAVE_DECODER_ARM64@
20+
#cmakedefine HAVE_DECODER_ARMTHUMB @HAVE_DECODER_ARMTHUMB@
21+
#cmakedefine HAVE_DECODER_DELTA @HAVE_DECODER_DELTA@
22+
#cmakedefine HAVE_DECODER_IA64 @HAVE_DECODER_IA64@
23+
#cmakedefine HAVE_DECODER_LZMA1 @HAVE_DECODER_LZMA1@
24+
#cmakedefine HAVE_DECODER_LZMA2 @HAVE_DECODER_LZMA2@
25+
#cmakedefine HAVE_DECODER_POWERPC @HAVE_DECODER_POWERPC@
26+
#cmakedefine HAVE_DECODER_RISCV @HAVE_DECODER_RISCV@
27+
#cmakedefine HAVE_DECODER_SPARC @HAVE_DECODER_SPARC@
28+
#cmakedefine HAVE_DECODER_X86 @HAVE_DECODER_X86@
29+
#cmakedefine HAVE_ELF_AUX_INFO @HAVE_ELF_AUX_INFO@
30+
#cmakedefine HAVE_ENCODER_ARM @HAVE_ENCODER_ARM@
31+
#cmakedefine HAVE_ENCODER_ARM64 @HAVE_ENCODER_ARM64@
32+
#cmakedefine HAVE_ENCODER_ARMTHUMB @HAVE_ENCODER_ARMTHUMB@
33+
#cmakedefine HAVE_ENCODER_DELTA @HAVE_ENCODER_DELTA@
34+
#cmakedefine HAVE_ENCODER_IA64 @HAVE_ENCODER_IA64@
35+
#cmakedefine HAVE_ENCODER_LZMA1 @HAVE_ENCODER_LZMA1@
36+
#cmakedefine HAVE_ENCODER_LZMA2 @HAVE_ENCODER_LZMA2@
37+
#cmakedefine HAVE_ENCODER_POWERPC @HAVE_ENCODER_POWERPC@
38+
#cmakedefine HAVE_ENCODER_RISCV @HAVE_ENCODER_RISCV@
39+
#cmakedefine HAVE_ENCODER_SPARC @HAVE_ENCODER_SPARC@
40+
#cmakedefine HAVE_ENCODER_X86 @HAVE_ENCODER_X86@
41+
#cmakedefine HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR @HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR@
42+
#cmakedefine HAVE_GETAUXVAL @HAVE_GETAUXVAL@
43+
#cmakedefine HAVE_HWCAP_CRC32 @HAVE_HWCAP_CRC32@
44+
#cmakedefine HAVE_IMMINTRIN_H @HAVE_IMMINTRIN_H@
45+
#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@
46+
#cmakedefine HAVE_LOONGARCH_CRC32 @HAVE_LOONGARCH_CRC32@
47+
#cmakedefine HAVE_LZIP_DECODER @HAVE_LZIP_DECODER@
48+
#cmakedefine HAVE_MBRTOWC @HAVE_MBRTOWC@
49+
#cmakedefine HAVE_MF_BT2 @HAVE_MF_BT2@
50+
#cmakedefine HAVE_MF_BT3 @HAVE_MF_BT3@
51+
#cmakedefine HAVE_MF_BT4 @HAVE_MF_BT4@
52+
#cmakedefine HAVE_MF_HC3 @HAVE_MF_HC3@
53+
#cmakedefine HAVE_MF_HC4 @HAVE_MF_HC4@
54+
#cmakedefine HAVE_PROGRAM_INVOCATION_NAME @HAVE_PROGRAM_INVOCATION_NAME@
55+
#cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK @HAVE_PTHREAD_CONDATTR_SETCLOCK@
56+
#cmakedefine HAVE_SHA256INIT @HAVE_SHA256INIT@
57+
#cmakedefine HAVE_SHA256_CTX @HAVE_SHA256_CTX@
58+
#cmakedefine HAVE_SHA256_H @HAVE_SHA256_H@
59+
#cmakedefine HAVE_SHA256_INIT @HAVE_SHA256_INIT@
60+
#cmakedefine HAVE_SHA2_CTX @HAVE_SHA2_CTX@
61+
#cmakedefine HAVE_SHA2_H @HAVE_SHA2_H@
62+
#cmakedefine HAVE_SMALL @HAVE_SMALL@
63+
#cmakedefine HAVE_STDBOOL_H @HAVE_STDBOOL_H@
64+
#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@
65+
#cmakedefine HAVE_SYMBOL_VERSIONS_LINUX @HAVE_SYMBOL_VERSIONS_LINUX@
66+
#cmakedefine HAVE_SYSCTLBYNAME @HAVE_SYSCTLBYNAME@
67+
#cmakedefine HAVE_SYS_BYTEORDER_H @HAVE_SYS_BYTEORDER_H@
68+
#cmakedefine HAVE_SYS_ENDIAN_H @HAVE_SYS_ENDIAN_H@
69+
#cmakedefine HAVE_SYS_PARAM_H @HAVE_SYS_PARAM_H@
70+
#cmakedefine HAVE_USABLE_CLMUL @HAVE_USABLE_CLMUL@
71+
#cmakedefine HAVE_VASPRINTF @HAVE_VASPRINTF@
72+
#cmakedefine HAVE_VISIBILITY @HAVE_VISIBILITY@
73+
#cmakedefine HAVE_WCWIDTH @HAVE_WCWIDTH@
74+
#cmakedefine HAVE__BOOL @HAVE__BOOL@
75+
#cmakedefine HAVE__MM_MOVEMASK_EPI8 @HAVE__MM_MOVEMASK_EPI8@
76+
#cmakedefine HAVE___BUILTIN_ASSUME_ALIGNED @HAVE___BUILTIN_ASSUME_ALIGNED@
77+
#cmakedefine HAVE___BUILTIN_BSWAPXX @HAVE___BUILTIN_BSWAPXX@
78+
#cmakedefine MYTHREAD_POSIX @MYTHREAD_POSIX@
79+
#cmakedefine MYTHREAD_VISTA @MYTHREAD_VISTA@
80+
#cmakedefine MYTHREAD_WIN95 @MYTHREAD_WIN95@
81+
#cmakedefine NDEBUG @NDEBUG@
82+
#cmakedefine PACKAGE @PACKAGE@
83+
#cmakedefine PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@
84+
#cmakedefine PACKAGE_NAME @PACKAGE_NAME@
85+
#cmakedefine PACKAGE_STRING @PACKAGE_STRING@
86+
#cmakedefine PACKAGE_TARNAME @PACKAGE_TARNAME@
87+
#cmakedefine PACKAGE_URL @PACKAGE_URL@
88+
#cmakedefine PACKAGE_VERSION @PACKAGE_VERSION@
7389
#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
74-
#cmakedefine TUKLIB_CPUCORES_CPUSET 1
75-
#cmakedefine TUKLIB_CPUCORES_PSTAT_GETDYNAMIC 1
76-
#cmakedefine TUKLIB_CPUCORES_SCHED_GETAFFINITY 1
77-
#cmakedefine TUKLIB_CPUCORES_SYSCONF 1
78-
#cmakedefine TUKLIB_CPUCORES_SYSCTL 1
79-
#cmakedefine TUKLIB_FAST_UNALIGNED_ACCESS 1
80-
#cmakedefine TUKLIB_PHYSMEM_AIX 1
81-
#cmakedefine TUKLIB_PHYSMEM_GETINVENT_R 1
82-
#cmakedefine TUKLIB_PHYSMEM_GETSYSINFO 1
83-
#cmakedefine TUKLIB_PHYSMEM_PSTAT_GETSTATIC 1
84-
#cmakedefine TUKLIB_PHYSMEM_SYSCONF 1
85-
#cmakedefine TUKLIB_PHYSMEM_SYSCTL 1
86-
#cmakedefine TUKLIB_PHYSMEM_SYSINFO 1
87-
#cmakedefine TUKLIB_USE_UNSAFE_TYPE_PUNNING 1
90+
#cmakedefine TUKLIB_CPUCORES_CPUSET @TUKLIB_CPUCORES_CPUSET@
91+
#cmakedefine TUKLIB_CPUCORES_PSTAT_GETDYNAMIC @TUKLIB_CPUCORES_PSTAT_GETDYNAMIC@
92+
#cmakedefine TUKLIB_CPUCORES_SCHED_GETAFFINITY @TUKLIB_CPUCORES_SCHED_GETAFFINITY@
93+
#cmakedefine TUKLIB_CPUCORES_SYSCONF @TUKLIB_CPUCORES_SYSCONF@
94+
#cmakedefine TUKLIB_CPUCORES_SYSCTL @TUKLIB_CPUCORES_SYSCTL@
95+
#cmakedefine TUKLIB_FAST_UNALIGNED_ACCESS @TUKLIB_FAST_UNALIGNED_ACCESS@
96+
#cmakedefine TUKLIB_PHYSMEM_AIX @TUKLIB_PHYSMEM_AIX@
97+
#cmakedefine TUKLIB_PHYSMEM_GETINVENT_R @TUKLIB_PHYSMEM_GETINVENT_R@
98+
#cmakedefine TUKLIB_PHYSMEM_GETSYSINFO @TUKLIB_PHYSMEM_GETSYSINFO@
99+
#cmakedefine TUKLIB_PHYSMEM_PSTAT_GETSTATIC @TUKLIB_PHYSMEM_PSTAT_GETSTATIC@
100+
#cmakedefine TUKLIB_PHYSMEM_SYSCONF @TUKLIB_PHYSMEM_SYSCONF@
101+
#cmakedefine TUKLIB_PHYSMEM_SYSCTL @TUKLIB_PHYSMEM_SYSCTL@
102+
#cmakedefine TUKLIB_PHYSMEM_SYSINFO @TUKLIB_PHYSMEM_SYSINFO@
103+
#cmakedefine TUKLIB_USE_UNSAFE_TYPE_PUNNING @TUKLIB_USE_UNSAFE_TYPE_PUNNING@
104+
#cmakedefine VERSION @VERSION@
105+
#cmakedefine int32_t @int32_t@
106+
#cmakedefine int64_t @int64_t@
107+
#cmakedefine uint16_t @uint16_t@
108+
#cmakedefine uint32_t @uint32_t@
109+
#cmakedefine uint64_t @uint64_t@
110+
#cmakedefine uint8_t @uint8_t@
111+
#cmakedefine uintptr_t @uintptr_t@
88112
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@

0 commit comments

Comments
 (0)