diff --git a/CMakeLists.txt b/CMakeLists.txt index 162578d91d5e136376b3e0137960216c213293bf..d15706ecddcc764d64bfa7cfd9bfe28f30f141ec 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,7 @@ if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON)) if (NOT (TARGET dap_chain_net_srv)) add_subdirectory(libdap-chain-net-srv) endif() - if (NOT (TARGET dap_server_http_db_auth)) + if (NOT (TARGET dap_server_http_db_auth) AND NOT ANDROID) add_subdirectory(libdap-server-http-db-auth) endif() if (NOT (TARGET dap_chain_gdb)) diff --git a/monero_crypto/CMakeLists.txt b/monero_crypto/CMakeLists.txt index ff4e1c32e2b2e9de7f131c0360209484cf53f88a..b71c6af18111614f899901534e64bffe5d401957 100755 --- a/monero_crypto/CMakeLists.txt +++ b/monero_crypto/CMakeLists.txt @@ -184,7 +184,7 @@ else() message(STATUS "AES support not available on ARMv6") elseif(ARM7) message(STATUS "AES support not available on ARMv7") - elseif(ARM8) + elseif(ARM8 AND NOT ANDROID) CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO) if(ARCH_PLUS_CRYPTO) message(STATUS "Crypto extensions enabled for ARMv8") @@ -219,7 +219,7 @@ else() #0xd08 - Cortex-A72 #0xd03 - Cortex-A73 - if(NOT ARM8) + if(NOT ARM8 AND NOT ANDROID) CHECK_CXX_ACCEPTS_FLAG(-mfpu=vfp3-d16 CXX_ACCEPTS_VFP3_D16) CHECK_CXX_ACCEPTS_FLAG(-mfpu=vfp4 CXX_ACCEPTS_VFP4) CHECK_CXX_ACCEPTS_FLAG(-mfloat-abi=hard CXX_ACCEPTS_MFLOAT_HARD)