mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 05:57:59 +01:00
Merge #16110: depends: Add Android NDK support
f9af3ced1cAndroid: add all arch support (Block Mechanic)d419ca7e32depends: export dynamic JNI symbols from static qtforandroid.a (Igor Cota)ed30684d03Qt: patch androidjnimain.cpp to make sure JNI is initialised when statically compiled (Igor Cota)e4c319e8a1builds: remove superfluous config_opts_aarch64_android (Igor Cota)24ffef0c27Patch libevent when building for Android (fix arc4random_addrandom) (Igor Cota)f1e40b3e71Update bitcoin_qt.m4 (BlockMechanic)b4057d8261Define TARGET_OS when host is android (Igor Cota)80b475f159Fix Android zlib cross compilation issue (https://stackoverflow.com/questions/21396988/zlib-build-not-configuring-properly-with-cross-compiler-ignores-ar) (Igor Cota)45f8219015Add full Android build example command and instructions on getting SDK/NDK (Igor Cota)b68f2a68c2Add config opts and patch for aarch64_android build of Qt (Igor Cota)9c4cb0166eAdd ranlib to android.mk hosts file (fix OSX Android NDK build) (Igor Cota)c2a749c9c1Add example Android host-platform-triplet and options (Igor Cota)0b0cff3c61Add support for building Android dependencies (Igor Cota) Pull request description: This allows one to build the dependencies with the Android SDK and goes towards fixing #11844. It has been tested to work with: `make HOST=aarch64-linux-android ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=/home/user/Android/Sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin NO_QT=1 NO_WALLET=1` ACKs for top commit: Sjors: ACKf9af3ce. I'm OK with merging and then improving later. Tree-SHA512: cb805115ebe5c9e33db2bf3eab8628808fe3f50052053d8877d8b8e4406d6fea1ed9e5c4dff85d777fb99c81be6ffb9d95a0e6d32344e728e5e0da6c653e2ce7
This commit is contained in:
@@ -15,12 +15,17 @@ $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win3
|
||||
$(package)_config_opts_x86_64_mingw32=address-model=64
|
||||
$(package)_config_opts_i686_mingw32=address-model=32
|
||||
$(package)_config_opts_i686_linux=address-model=32 architecture=x86
|
||||
$(package)_config_opts_i686_android=address-model=32
|
||||
$(package)_config_opts_aarch64_android=address-model=64
|
||||
$(package)_config_opts_x86_64_android=address-model=64
|
||||
$(package)_config_opts_armv7a_android=address-model=32
|
||||
$(package)_toolset_$(host_os)=gcc
|
||||
$(package)_archiver_$(host_os)=$($(package)_ar)
|
||||
$(package)_toolset_darwin=clang-darwin
|
||||
$(package)_config_libraries=chrono,filesystem,system,thread,test
|
||||
$(package)_cxxflags=-std=c++11 -fvisibility=hidden
|
||||
$(package)_cxxflags_linux=-fPIC
|
||||
$(package)_cxxflags_android=-fPIC
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
|
||||
Reference in New Issue
Block a user