Merge pull request #6 from airtimemedia/feature/CAR-601--Android-Build-Carmel-for-arm64-x86-64

Aaron Wong · web-flow · commit 17a0b8f01d3c · 2019-08-02T17:18:52.000+08:00
CAR-601 Fix arm64 build for Android
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -78,7 +78,7 @@ if (${ARCH} STREQUAL "arm" OR "${REAL_ARCH}" STREQUAL "arm")
   )
 endif()
 
-if (${ARCH} STREQUAL "aarch64")
+if (${ARCH} STREQUAL "aarch64" OR "${REAL_ARCH}" STREQUAL "aarch64")
   set(
     CRYPTO_ARCH_SOURCES
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ if (${ARCH} STREQUAL "arm" OR "${REAL_ARCH}" STREQUAL "arm")`
`78`	`78`	`)`
`79`	`79`	`endif()`
`80`	`80`
`81`		`-if (${ARCH} STREQUAL "aarch64")`
	`81`	`+if (${ARCH} STREQUAL "aarch64" OR "${REAL_ARCH}" STREQUAL "aarch64")`
`82`	`82`	`set(`
`83`	`83`	`CRYPTO_ARCH_SOURCES`
`84`	`84`