All Android targets need help finding the liblog folder for SQLCipher

Author: Doy-lee

external/openssl-cmake/CMakeLists.txt

@@ -164,7 +164,7 @@ if(CMAKE_CROSSCOMPILING)
         #  /usr/lib/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/x86_64-linux-android/asm/
         if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
             set(deps_CFLAGS "${deps_CFLAGS} -I${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/include/x86_64-linux-android")
-        elseif()
+        else()
             set(deps_CFLAGS "${deps_CFLAGS} -I${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/include/i686-linux-android")
         endif()
     endif()

external/sqlcipher-cmake/CMakeLists.txt

@@ -126,14 +126,12 @@ else()
     endif()
 
     if(ANDROID)
-        # NOTE: x86 build seems to have trouble finding -llog, help it find it by specifying the
-        # library path
-        if(CMAKE_ANDROID_ARCH_ABI MATCHES x86)
-            set(sqlcipher_ldflags "${sqlcipher_ldflags} -L${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/i686-linux-android/${ANDROID_PLATFORM_LEVEL} -lm")
-        endif()
+        # NOTE: SQLCipher seems to have trouble finding liblog and libm which is in this folder here
+        # in the sysroot
+        set(sqlcipher_ldflags "${sqlcipher_ldflags} -L${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${android_toolchain_prefix}-${android_toolchain_suffix}/${ANDROID_PLATFORM_LEVEL}")
 
         # NOTE: SQLite uses __android_log_print and __android_log_write which is in their liblog library
-        set(sqlcipher_ldflags "${sqlcipher_ldflags} -llog")
+        set(sqlcipher_ldflags "${sqlcipher_ldflags} -lm -llog")
     endif()
 
     set(sqlcipher_cflags "${sqlcipher_cflags} -DSQLCIPHER_CRYPTO_OPENSSL -I${OPENSSL_INCLUDE_DIRS}")