Assist SQLCipher in finding the liblog directory

Author: Doy-lee

external/openssl-cmake/CMakeLists.txt

@@ -162,7 +162,11 @@ if(CMAKE_CROSSCOMPILING)
         #  /usr/lib/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/linux/types.h:9:10: fatal error: 'asm/types.h' file not found
         # At
         #  /usr/lib/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/x86_64-linux-android/asm/
-        set(deps_CFLAGS "${deps_CFLAGS} -I${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/include/x86_64-linux-android")
+        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()
+            set(deps_CFLAGS "${deps_CFLAGS} -I${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/include/i686-linux-android")
+        endif()
     endif()
   endif()
 endif()

external/sqlcipher-cmake/CMakeLists.txt

@@ -126,6 +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: SQLite uses __android_log_print and __android_log_write which is in their liblog library
         set(sqlcipher_ldflags "${sqlcipher_ldflags} -llog")
     endif()