native cmake tweaks

native/build.gradle

@@ -12,12 +12,6 @@ android {
         targetSdkVersion 32
         consumerProguardFiles 'proguard-rules.pro'
 
-        externalNativeBuild {
-            cmake {
-                arguments '-DANDROID_STL=c++_static'
-            }
-        }
-
         ndk {
             abiFilters 'arm64-v8a', 'x86_64'
         }
@@ -25,6 +19,7 @@ android {
 
     externalNativeBuild {
         cmake {
+            version "3.23.1"
             path 'src/main/jni/CMakeLists.txt'
         }
     }

native/src/main/jni/CMakeLists.txt

@@ -1,8 +1,8 @@
 project(ehviewer)
 cmake_minimum_required(VERSION 3.4.1)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Oz -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Oz -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-rtti -fno-stack-protector")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-rtti -fno-stack-protector")
 
 add_subdirectory(a7zip)
 add_subdirectory(image)
@@ -10,7 +10,7 @@ add_subdirectory(integrity)
 
 add_library(${PROJECT_NAME} SHARED main.c)
 
-target_compile_options(${PROJECT_NAME} PUBLIC -Oz -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions)
+target_compile_options(${PROJECT_NAME} PUBLIC -fvisibility=hidden -fvisibility-inlines-hidden -fno-exceptions)
 
 target_include_directories(${PROJECT_NAME} PUBLIC a7zip/a7zip image/image integrity)
 

native/src/main/jni/image/CMakeLists.txt

@@ -14,8 +14,6 @@
 
 cmake_minimum_required(VERSION 3.4.1)
 
-include(AndroidNdkModules)
-android_ndk_import_module_cpufeatures()
 add_subdirectory(image)
 add_subdirectory(stream)
 add_subdirectory(libjpeg-turbo)

native/src/main/jni/image/giflib/CMakeLists.txt

@@ -16,11 +16,11 @@ cmake_minimum_required(VERSION 3.4.1)
 project(giflib C)
 
 set(GIFLIB_SOURCES
-    giflib/dgif_lib.c
-    giflib/gif_hash.c
-    giflib/gifalloc.c
-    giflib/openbsd-reallocarray.c
-)
+        giflib/dgif_lib.c
+        giflib/gif_hash.c
+        giflib/gifalloc.c
+        giflib/openbsd-reallocarray.c
+        )
 set(GIFLIB_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/giflib)
 
 add_library(giflib STATIC ${GIFLIB_SOURCES})

native/src/main/jni/image/image/CMakeLists.txt

@@ -16,28 +16,28 @@ cmake_minimum_required(VERSION 3.4.1)
 project(image C)
 
 set(IMAGE_SOURCES
-    image.c
-    image_utils.c
-    image_plain.c
-    image_jpeg.c
-    image_png.c
-    image_gif.c
-    filter/clahe.c
-    filter/gray.c
-    java_wrapper.c
-)
+        image.c
+        image_utils.c
+        image_plain.c
+        image_jpeg.c
+        image_png.c
+        image_gif.c
+        filter/clahe.c
+        filter/gray.c
+        java_wrapper.c
+        )
 set(IMAGE_INCLUDES
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        )
 set(IMAGE_LIBRARIES
-    log
-    jnigraphics
-    GLESv2
-    stream
-    libjpeg-turbo
-    libpng
-    giflib
-)
+        log
+        jnigraphics
+        GLESv2
+        stream
+        libjpeg-turbo
+        libpng
+        giflib
+        )
 
 add_library(image STATIC ${IMAGE_SOURCES})
 target_include_directories(image PRIVATE ${IMAGE_INCLUDES})

native/src/main/jni/image/libjpeg-turbo/CMakeLists.txt

@@ -16,194 +16,194 @@ cmake_minimum_required(VERSION 3.4.1)
 project(libjpeg-turbo C)
 
 set(LIBJPEG_TURBO_SOURCES
-    libjpeg-turbo/jaricom.c
-    libjpeg-turbo/jcomapi.c
-    libjpeg-turbo/jdapimin.c
-    libjpeg-turbo/jdapistd.c
-    libjpeg-turbo/jdarith.c
-    libjpeg-turbo/jdatasrc.c
-    libjpeg-turbo/jdatasrc-tj.c
-    libjpeg-turbo/jdcoefct.c
-    libjpeg-turbo/jdcolor.c
-    libjpeg-turbo/jddctmgr.c
-    libjpeg-turbo/jdhuff.c
-    libjpeg-turbo/jdinput.c
-    libjpeg-turbo/jdmainct.c
-    libjpeg-turbo/jdmarker.c
-    libjpeg-turbo/jdmaster.c
-    libjpeg-turbo/jdmerge.c
-    libjpeg-turbo/jdphuff.c
-    libjpeg-turbo/jdpostct.c
-    libjpeg-turbo/jdsample.c
-    libjpeg-turbo/jdtrans.c
-    libjpeg-turbo/jerror.c
-    libjpeg-turbo/jfdctflt.c
-    libjpeg-turbo/jfdctfst.c
-    libjpeg-turbo/jfdctint.c
-    libjpeg-turbo/jidctflt.c
-    libjpeg-turbo/jidctfst.c
-    libjpeg-turbo/jidctint.c
-    libjpeg-turbo/jidctred.c
-    libjpeg-turbo/jmemmgr.c
-    libjpeg-turbo/jmemnobs.c
-    libjpeg-turbo/jquant1.c
-    libjpeg-turbo/jquant2.c
-    libjpeg-turbo/jutils.c
-)
+        libjpeg-turbo/jaricom.c
+        libjpeg-turbo/jcomapi.c
+        libjpeg-turbo/jdapimin.c
+        libjpeg-turbo/jdapistd.c
+        libjpeg-turbo/jdarith.c
+        libjpeg-turbo/jdatasrc.c
+        libjpeg-turbo/jdatasrc-tj.c
+        libjpeg-turbo/jdcoefct.c
+        libjpeg-turbo/jdcolor.c
+        libjpeg-turbo/jddctmgr.c
+        libjpeg-turbo/jdhuff.c
+        libjpeg-turbo/jdinput.c
+        libjpeg-turbo/jdmainct.c
+        libjpeg-turbo/jdmarker.c
+        libjpeg-turbo/jdmaster.c
+        libjpeg-turbo/jdmerge.c
+        libjpeg-turbo/jdphuff.c
+        libjpeg-turbo/jdpostct.c
+        libjpeg-turbo/jdsample.c
+        libjpeg-turbo/jdtrans.c
+        libjpeg-turbo/jerror.c
+        libjpeg-turbo/jfdctflt.c
+        libjpeg-turbo/jfdctfst.c
+        libjpeg-turbo/jfdctint.c
+        libjpeg-turbo/jidctflt.c
+        libjpeg-turbo/jidctfst.c
+        libjpeg-turbo/jidctint.c
+        libjpeg-turbo/jidctred.c
+        libjpeg-turbo/jmemmgr.c
+        libjpeg-turbo/jmemnobs.c
+        libjpeg-turbo/jquant1.c
+        libjpeg-turbo/jquant2.c
+        libjpeg-turbo/jutils.c
+        )
 set(LIBJPEG_TURBO_INCLUDES
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo
-)
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo
+        )
 
 if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
 
-  enable_language(ASM)
+    enable_language(ASM)
 
-  add_definitions(-DNEON_INTRINSICS)
+    add_definitions(-DNEON_INTRINSICS)
 
-  set(LIBJPEG_TURBO_SOURCES
-      ${LIBJPEG_TURBO_SOURCES}
-          libjpeg-turbo/simd/arm/jccolor-neon.c
-          libjpeg-turbo/simd/arm/jidctred-neon.c
-          libjpeg-turbo/simd/arm/jquanti-neon.c
-          libjpeg-turbo/simd/arm/jidctint-neon.c
-          libjpeg-turbo/simd/arm/jidctfst-neon.c
-          libjpeg-turbo/simd/arm/jfdctint-neon.c
-          libjpeg-turbo/simd/arm/jfdctfst-neon.c
-          libjpeg-turbo/simd/arm/jdsample-neon.c
-          libjpeg-turbo/simd/arm/jdmerge-neon.c
-          libjpeg-turbo/simd/arm/jdcolor-neon.c
-          libjpeg-turbo/simd/arm/jcsample-neon.c
-          libjpeg-turbo/simd/arm/jcphuff-neon.c
-          libjpeg-turbo/simd/arm/jcgray-neon.c
-          libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c
-          libjpeg-turbo/simd/arm/aarch32/jsimd.c
-  )
+    set(LIBJPEG_TURBO_SOURCES
+            ${LIBJPEG_TURBO_SOURCES}
+            libjpeg-turbo/simd/arm/jccolor-neon.c
+            libjpeg-turbo/simd/arm/jidctred-neon.c
+            libjpeg-turbo/simd/arm/jquanti-neon.c
+            libjpeg-turbo/simd/arm/jidctint-neon.c
+            libjpeg-turbo/simd/arm/jidctfst-neon.c
+            libjpeg-turbo/simd/arm/jfdctint-neon.c
+            libjpeg-turbo/simd/arm/jfdctfst-neon.c
+            libjpeg-turbo/simd/arm/jdsample-neon.c
+            libjpeg-turbo/simd/arm/jdmerge-neon.c
+            libjpeg-turbo/simd/arm/jdcolor-neon.c
+            libjpeg-turbo/simd/arm/jcsample-neon.c
+            libjpeg-turbo/simd/arm/jcphuff-neon.c
+            libjpeg-turbo/simd/arm/jcgray-neon.c
+            libjpeg-turbo/simd/arm/aarch32/jchuff-neon.c
+            libjpeg-turbo/simd/arm/aarch32/jsimd.c
+            )
 
 elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
 
-  enable_language(ASM)
+    enable_language(ASM)
 
-  add_definitions(-DNEON_INTRINSICS)
+    add_definitions(-DNEON_INTRINSICS)
 
-  set(LIBJPEG_TURBO_SOURCES
-      ${LIBJPEG_TURBO_SOURCES}
-          libjpeg-turbo/simd/arm/jccolor-neon.c
-          libjpeg-turbo/simd/arm/jidctred-neon.c
-          libjpeg-turbo/simd/arm/jquanti-neon.c
-          libjpeg-turbo/simd/arm/jidctint-neon.c
-          libjpeg-turbo/simd/arm/jidctfst-neon.c
-          libjpeg-turbo/simd/arm/jfdctint-neon.c
-          libjpeg-turbo/simd/arm/jfdctfst-neon.c
-          libjpeg-turbo/simd/arm/jdsample-neon.c
-          libjpeg-turbo/simd/arm/jdmerge-neon.c
-          libjpeg-turbo/simd/arm/jdcolor-neon.c
-          libjpeg-turbo/simd/arm/jcsample-neon.c
-          libjpeg-turbo/simd/arm/jcphuff-neon.c
-          libjpeg-turbo/simd/arm/jcgray-neon.c
-          libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c
-          libjpeg-turbo/simd/arm/aarch64/jsimd.c
-  )
+    set(LIBJPEG_TURBO_SOURCES
+            ${LIBJPEG_TURBO_SOURCES}
+            libjpeg-turbo/simd/arm/jccolor-neon.c
+            libjpeg-turbo/simd/arm/jidctred-neon.c
+            libjpeg-turbo/simd/arm/jquanti-neon.c
+            libjpeg-turbo/simd/arm/jidctint-neon.c
+            libjpeg-turbo/simd/arm/jidctfst-neon.c
+            libjpeg-turbo/simd/arm/jfdctint-neon.c
+            libjpeg-turbo/simd/arm/jfdctfst-neon.c
+            libjpeg-turbo/simd/arm/jdsample-neon.c
+            libjpeg-turbo/simd/arm/jdmerge-neon.c
+            libjpeg-turbo/simd/arm/jdcolor-neon.c
+            libjpeg-turbo/simd/arm/jcsample-neon.c
+            libjpeg-turbo/simd/arm/jcphuff-neon.c
+            libjpeg-turbo/simd/arm/jcgray-neon.c
+            libjpeg-turbo/simd/arm/aarch64/jchuff-neon.c
+            libjpeg-turbo/simd/arm/aarch64/jsimd.c
+            )
 
 elseif (${ANDROID_ABI} STREQUAL "x86")
 
-  enable_language(ASM_NASM)
+    enable_language(ASM_NASM)
 
-  set(LIBJPEG_TURBO_SOURCES
-      ${LIBJPEG_TURBO_SOURCES}
-      libjpeg-turbo/simd/i386/jsimd.c
-      libjpeg-turbo/simd/i386/jsimdcpu.asm
-      libjpeg-turbo/simd/i386/jfdctflt-3dn.asm
-      libjpeg-turbo/simd/i386/jidctflt-3dn.asm
-      libjpeg-turbo/simd/i386/jquant-3dn.asm
-      libjpeg-turbo/simd/i386/jccolor-mmx.asm
-      libjpeg-turbo/simd/i386/jcgray-mmx.asm
-      libjpeg-turbo/simd/i386/jcsample-mmx.asm
-      libjpeg-turbo/simd/i386/jdcolor-mmx.asm
-      libjpeg-turbo/simd/i386/jdmerge-mmx.asm
-      libjpeg-turbo/simd/i386/jdsample-mmx.asm
-      libjpeg-turbo/simd/i386/jfdctfst-mmx.asm
-      libjpeg-turbo/simd/i386/jfdctint-mmx.asm
-      libjpeg-turbo/simd/i386/jidctfst-mmx.asm
-      libjpeg-turbo/simd/i386/jidctint-mmx.asm
-      libjpeg-turbo/simd/i386/jidctred-mmx.asm
-      libjpeg-turbo/simd/i386/jquant-mmx.asm
-      libjpeg-turbo/simd/i386/jfdctflt-sse.asm
-      libjpeg-turbo/simd/i386/jidctflt-sse.asm
-      libjpeg-turbo/simd/i386/jquant-sse.asm
-      libjpeg-turbo/simd/i386/jccolor-sse2.asm
-      libjpeg-turbo/simd/i386/jcgray-sse2.asm
-      libjpeg-turbo/simd/i386/jchuff-sse2.asm
-      libjpeg-turbo/simd/i386/jcphuff-sse2.asm
-      libjpeg-turbo/simd/i386/jcsample-sse2.asm
-      libjpeg-turbo/simd/i386/jdcolor-sse2.asm
-      libjpeg-turbo/simd/i386/jdmerge-sse2.asm
-      libjpeg-turbo/simd/i386/jdsample-sse2.asm
-      libjpeg-turbo/simd/i386/jfdctfst-sse2.asm
-      libjpeg-turbo/simd/i386/jfdctint-sse2.asm
-      libjpeg-turbo/simd/i386/jidctflt-sse2.asm
-      libjpeg-turbo/simd/i386/jidctfst-sse2.asm
-      libjpeg-turbo/simd/i386/jidctint-sse2.asm
-      libjpeg-turbo/simd/i386/jidctred-sse2.asm
-      libjpeg-turbo/simd/i386/jquantf-sse2.asm
-      libjpeg-turbo/simd/i386/jquanti-sse2.asm
-      libjpeg-turbo/simd/i386/jccolor-avx2.asm
-      libjpeg-turbo/simd/i386/jcgray-avx2.asm
-      libjpeg-turbo/simd/i386/jcsample-avx2.asm
-      libjpeg-turbo/simd/i386/jdcolor-avx2.asm
-      libjpeg-turbo/simd/i386/jdmerge-avx2.asm
-      libjpeg-turbo/simd/i386/jdsample-avx2.asm
-      libjpeg-turbo/simd/i386/jfdctint-avx2.asm
-      libjpeg-turbo/simd/i386/jidctint-avx2.asm
-      libjpeg-turbo/simd/i386/jquanti-avx2.asm
-  )
+    set(LIBJPEG_TURBO_SOURCES
+            ${LIBJPEG_TURBO_SOURCES}
+            libjpeg-turbo/simd/i386/jsimd.c
+            libjpeg-turbo/simd/i386/jsimdcpu.asm
+            libjpeg-turbo/simd/i386/jfdctflt-3dn.asm
+            libjpeg-turbo/simd/i386/jidctflt-3dn.asm
+            libjpeg-turbo/simd/i386/jquant-3dn.asm
+            libjpeg-turbo/simd/i386/jccolor-mmx.asm
+            libjpeg-turbo/simd/i386/jcgray-mmx.asm
+            libjpeg-turbo/simd/i386/jcsample-mmx.asm
+            libjpeg-turbo/simd/i386/jdcolor-mmx.asm
+            libjpeg-turbo/simd/i386/jdmerge-mmx.asm
+            libjpeg-turbo/simd/i386/jdsample-mmx.asm
+            libjpeg-turbo/simd/i386/jfdctfst-mmx.asm
+            libjpeg-turbo/simd/i386/jfdctint-mmx.asm
+            libjpeg-turbo/simd/i386/jidctfst-mmx.asm
+            libjpeg-turbo/simd/i386/jidctint-mmx.asm
+            libjpeg-turbo/simd/i386/jidctred-mmx.asm
+            libjpeg-turbo/simd/i386/jquant-mmx.asm
+            libjpeg-turbo/simd/i386/jfdctflt-sse.asm
+            libjpeg-turbo/simd/i386/jidctflt-sse.asm
+            libjpeg-turbo/simd/i386/jquant-sse.asm
+            libjpeg-turbo/simd/i386/jccolor-sse2.asm
+            libjpeg-turbo/simd/i386/jcgray-sse2.asm
+            libjpeg-turbo/simd/i386/jchuff-sse2.asm
+            libjpeg-turbo/simd/i386/jcphuff-sse2.asm
+            libjpeg-turbo/simd/i386/jcsample-sse2.asm
+            libjpeg-turbo/simd/i386/jdcolor-sse2.asm
+            libjpeg-turbo/simd/i386/jdmerge-sse2.asm
+            libjpeg-turbo/simd/i386/jdsample-sse2.asm
+            libjpeg-turbo/simd/i386/jfdctfst-sse2.asm
+            libjpeg-turbo/simd/i386/jfdctint-sse2.asm
+            libjpeg-turbo/simd/i386/jidctflt-sse2.asm
+            libjpeg-turbo/simd/i386/jidctfst-sse2.asm
+            libjpeg-turbo/simd/i386/jidctint-sse2.asm
+            libjpeg-turbo/simd/i386/jidctred-sse2.asm
+            libjpeg-turbo/simd/i386/jquantf-sse2.asm
+            libjpeg-turbo/simd/i386/jquanti-sse2.asm
+            libjpeg-turbo/simd/i386/jccolor-avx2.asm
+            libjpeg-turbo/simd/i386/jcgray-avx2.asm
+            libjpeg-turbo/simd/i386/jcsample-avx2.asm
+            libjpeg-turbo/simd/i386/jdcolor-avx2.asm
+            libjpeg-turbo/simd/i386/jdmerge-avx2.asm
+            libjpeg-turbo/simd/i386/jdsample-avx2.asm
+            libjpeg-turbo/simd/i386/jfdctint-avx2.asm
+            libjpeg-turbo/simd/i386/jidctint-avx2.asm
+            libjpeg-turbo/simd/i386/jquanti-avx2.asm
+            )
 
-  set(CMAKE_ASM_NASM_FLAGS "-DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm")
+    set(CMAKE_ASM_NASM_FLAGS "-DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm")
 
 elseif (${ANDROID_ABI} STREQUAL "x86_64")
 
-  enable_language(ASM_NASM)
+    enable_language(ASM_NASM)
 
-  set(LIBJPEG_TURBO_SOURCES
-      ${LIBJPEG_TURBO_SOURCES}
-      libjpeg-turbo/simd/x86_64/jsimd.c
-      libjpeg-turbo/simd/x86_64/jsimdcpu.asm
-      libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm
-      libjpeg-turbo/simd/x86_64/jccolor-sse2.asm
-      libjpeg-turbo/simd/x86_64/jcgray-sse2.asm
-      libjpeg-turbo/simd/x86_64/jchuff-sse2.asm
-      libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm
-      libjpeg-turbo/simd/x86_64/jcsample-sse2.asm
-      libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm
-      libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm
-      libjpeg-turbo/simd/x86_64/jdsample-sse2.asm
-      libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm
-      libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm
-      libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm
-      libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm
-      libjpeg-turbo/simd/x86_64/jidctint-sse2.asm
-      libjpeg-turbo/simd/x86_64/jidctred-sse2.asm
-      libjpeg-turbo/simd/x86_64/jquantf-sse2.asm
-      libjpeg-turbo/simd/x86_64/jquanti-sse2.asm
-      libjpeg-turbo/simd/x86_64/jccolor-avx2.asm
-      libjpeg-turbo/simd/x86_64/jcgray-avx2.asm
-      libjpeg-turbo/simd/x86_64/jcsample-avx2.asm
-      libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm
-      libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm
-      libjpeg-turbo/simd/x86_64/jdsample-avx2.asm
-      libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm
-      libjpeg-turbo/simd/x86_64/jidctint-avx2.asm
-      libjpeg-turbo/simd/x86_64/jquanti-avx2.asm
-  )
+    set(LIBJPEG_TURBO_SOURCES
+            ${LIBJPEG_TURBO_SOURCES}
+            libjpeg-turbo/simd/x86_64/jsimd.c
+            libjpeg-turbo/simd/x86_64/jsimdcpu.asm
+            libjpeg-turbo/simd/x86_64/jfdctflt-sse.asm
+            libjpeg-turbo/simd/x86_64/jccolor-sse2.asm
+            libjpeg-turbo/simd/x86_64/jcgray-sse2.asm
+            libjpeg-turbo/simd/x86_64/jchuff-sse2.asm
+            libjpeg-turbo/simd/x86_64/jcphuff-sse2.asm
+            libjpeg-turbo/simd/x86_64/jcsample-sse2.asm
+            libjpeg-turbo/simd/x86_64/jdcolor-sse2.asm
+            libjpeg-turbo/simd/x86_64/jdmerge-sse2.asm
+            libjpeg-turbo/simd/x86_64/jdsample-sse2.asm
+            libjpeg-turbo/simd/x86_64/jfdctfst-sse2.asm
+            libjpeg-turbo/simd/x86_64/jfdctint-sse2.asm
+            libjpeg-turbo/simd/x86_64/jidctflt-sse2.asm
+            libjpeg-turbo/simd/x86_64/jidctfst-sse2.asm
+            libjpeg-turbo/simd/x86_64/jidctint-sse2.asm
+            libjpeg-turbo/simd/x86_64/jidctred-sse2.asm
+            libjpeg-turbo/simd/x86_64/jquantf-sse2.asm
+            libjpeg-turbo/simd/x86_64/jquanti-sse2.asm
+            libjpeg-turbo/simd/x86_64/jccolor-avx2.asm
+            libjpeg-turbo/simd/x86_64/jcgray-avx2.asm
+            libjpeg-turbo/simd/x86_64/jcsample-avx2.asm
+            libjpeg-turbo/simd/x86_64/jdcolor-avx2.asm
+            libjpeg-turbo/simd/x86_64/jdmerge-avx2.asm
+            libjpeg-turbo/simd/x86_64/jdsample-avx2.asm
+            libjpeg-turbo/simd/x86_64/jfdctint-avx2.asm
+            libjpeg-turbo/simd/x86_64/jidctint-avx2.asm
+            libjpeg-turbo/simd/x86_64/jquanti-avx2.asm
+            )
 
-  set(CMAKE_ASM_NASM_FLAGS "-D__x86_64__ -DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm")
+    set(CMAKE_ASM_NASM_FLAGS "-D__x86_64__ -DELF -DPIC -I${CMAKE_CURRENT_SOURCE_DIR}/libjpeg-turbo/simd/nasm")
 
 else ()
 
-  set(LIBJPEG_TURBO_SOURCES
-      ${LIBJPEG_TURBO_SOURCES}
-      libjpeg-turbo/jsimd_none.c
-  )
+    set(LIBJPEG_TURBO_SOURCES
+            ${LIBJPEG_TURBO_SOURCES}
+            libjpeg-turbo/jsimd_none.c
+            )
 
 endif ()
 

native/src/main/jni/image/libpng/CMakeLists.txt

@@ -16,77 +16,78 @@ cmake_minimum_required(VERSION 3.4.1)
 project(libpng C)
 
 set(LIBPNG_SOURCES
-    libpng/png.c
-    libpng/pngerror.c
-    libpng/pngget.c
-    libpng/pngmem.c
-    libpng/pngpread.c
-    libpng/pngread.c
-    libpng/pngrio.c
-    libpng/pngrtran.c
-    libpng/pngrutil.c
-    libpng/pngset.c
-    libpng/pngtrans.c
-)
+        libpng/png.c
+        libpng/pngerror.c
+        libpng/pngget.c
+        libpng/pngmem.c
+        libpng/pngpread.c
+        libpng/pngread.c
+        libpng/pngrio.c
+        libpng/pngrtran.c
+        libpng/pngrutil.c
+        libpng/pngset.c
+        libpng/pngtrans.c
+        )
+
 set(LIBPNG_INCLUDES
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/libpng
-)
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/libpng
+        )
 set(LIBPNG_DEFINITIONS)
 set(LIBPNG_LIBRARIES z)
 
 if (${ANDROID_ABI} STREQUAL "armeabi-v7a")
 
-  enable_language(ASM)
+    enable_language(ASM)
 
-  set(LIBPNG_SOURCES
-      ${LIBPNG_SOURCES}
-      libpng/arm/arm_init.c
-      libpng/arm/filter_neon.S
-  )
-  set(LIBPNG_INCLUDES
-      ${LIBPNG_INCLUDES}
-      ${ANDROID_NDK}/sources/android/cpufeatures
-  )
-  set(LIBPNG_DEFINITIONS
-      ${LIBPNG_DEFINITIONS}
-      -DPNG_ARM_NEON_API_SUPPORTED
-      -DPNG_ARM_NEON_CHECK_SUPPORTED
-      -DPNG_ARM_NEON_OPT=1
-      -DPNG_ARM_NEON_IMPLEMENTATION=2
-      -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\"
-  )
-  set(LIBPNG_LIBRARIES
-      ${LIBPNG_LIBRARIES}
-      cpufeatures
-  )
+    set(LIBPNG_SOURCES
+            ${LIBPNG_SOURCES}
+            libpng/arm/arm_init.c
+            libpng/arm/filter_neon.S
+            ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
+            )
+    set(LIBPNG_INCLUDES
+            ${LIBPNG_INCLUDES}
+            ${ANDROID_NDK}/sources/android/cpufeatures
+            )
+    set(LIBPNG_DEFINITIONS
+            ${LIBPNG_DEFINITIONS}
+            -DPNG_ARM_NEON_API_SUPPORTED
+            -DPNG_ARM_NEON_CHECK_SUPPORTED
+            -DPNG_ARM_NEON_OPT=1
+            -DPNG_ARM_NEON_IMPLEMENTATION=2
+            -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\"
+            )
+    set(LIBPNG_LIBRARIES
+            ${LIBPNG_LIBRARIES}
+            )
 
 elseif (${ANDROID_ABI} STREQUAL "arm64-v8a")
 
-  enable_language(ASM)
+    enable_language(ASM)
 
-  set(LIBPNG_SOURCES
-      ${LIBPNG_SOURCES}
-      libpng/arm/arm_init.c
-      libpng/arm/filter_neon_intrinsics.c
-      libpng/arm/palette_neon_intrinsics.c
-  )
-  set(LIBPNG_INCLUDES
-      ${LIBPNG_INCLUDES}
-      ${ANDROID_NDK}/sources/android/cpufeatures
-  )
-  set(LIBPNG_DEFINITIONS
-      ${LIBPNG_DEFINITIONS}
-      -DPNG_ARM_NEON_API_SUPPORTED
-      -DPNG_ARM_NEON_CHECK_SUPPORTED
-      -DPNG_ARM_NEON_OPT=1
-      -DPNG_ARM_NEON_IMPLEMENTATION=1
-      -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\"
-  )
-  set(LIBPNG_LIBRARIES
-      ${LIBPNG_LIBRARIES}
-      cpufeatures
-  )
+    set(LIBPNG_SOURCES
+            ${LIBPNG_SOURCES}
+            libpng/arm/arm_init.c
+            libpng/arm/filter_neon_intrinsics.c
+            libpng/arm/palette_neon_intrinsics.c
+            ${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c
+            )
+    set(LIBPNG_INCLUDES
+            ${LIBPNG_INCLUDES}
+            ${ANDROID_NDK}/sources/android/cpufeatures
+            )
+    set(LIBPNG_DEFINITIONS
+            ${LIBPNG_DEFINITIONS}
+            -DPNG_ARM_NEON_API_SUPPORTED
+            -DPNG_ARM_NEON_CHECK_SUPPORTED
+            -DPNG_ARM_NEON_OPT=1
+            -DPNG_ARM_NEON_IMPLEMENTATION=1
+            -DPNG_ARM_NEON_FILE=\"contrib/arm-neon/android-ndk.c\"
+            )
+    set(LIBPNG_LIBRARIES
+            ${LIBPNG_LIBRARIES}
+            )
 
 endif ()