aboutsummaryrefslogtreecommitdiff
path: root/depends/packages/qt.mk
diff options
context:
space:
mode:
authorBlock Mechanic <blockmecha@gmail.com>2019-10-18 22:03:51 +0200
committerIgor Cota <igor@codexapertus.com>2019-10-18 22:24:21 +0200
commitf9af3ced1c69d65c5c530ec5526f5eefaf786126 (patch)
tree0ac3898a55bfa71e69a1ea8cadceb5e3eb8b6987 /depends/packages/qt.mk
parentd419ca7e32bfc71e8dd1f1b91870463eacd6ad8e (diff)
downloadbitcoin-f9af3ced1c69d65c5c530ec5526f5eefaf786126.tar.xz
Android: add all arch support
Add support for armv7a, i686 and x86_64 archs to android.mk Add -fPIC to depends file as anddroid requires it see https://stackoverflow.com/questions/30498776/position-independent-executables-and-android
Diffstat (limited to 'depends/packages/qt.mk')
-rw-r--r--depends/packages/qt.mk32
1 files changed, 19 insertions, 13 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 2f10a587c4..d4c4ab0ae8 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -127,20 +127,26 @@ $(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
-$(package)_config_opts_aarch64_android = -xplatform android-clang
-$(package)_config_opts_aarch64_android += -android-sdk $(ANDROID_SDK)
-$(package)_config_opts_aarch64_android += -android-ndk $(ANDROID_NDK)
-$(package)_config_opts_aarch64_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
-$(package)_config_opts_aarch64_android += -device-option CROSS_COMPILE="$(host)-"
+
+$(package)_config_opts_android = -xplatform android-clang
+$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
+$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
+$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
+$(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-"
+$(package)_config_opts_android += -egl
+$(package)_config_opts_android += -qpa xcb
+$(package)_config_opts_android += -no-eglfs
+$(package)_config_opts_android += -opengl es2
+$(package)_config_opts_android += -qt-freetype
+$(package)_config_opts_android += -no-fontconfig
+$(package)_config_opts_android += -L $(host_prefix)/lib
+$(package)_config_opts_android += -I $(host_prefix)/include
+
$(package)_config_opts_aarch64_android += -android-arch arm64-v8a
-$(package)_config_opts_aarch64_android += -egl
-$(package)_config_opts_aarch64_android += -qpa xcb
-$(package)_config_opts_aarch64_android += -no-eglfs
-$(package)_config_opts_aarch64_android += -opengl es2
-$(package)_config_opts_aarch64_android += -qt-freetype
-$(package)_config_opts_aarch64_android += -no-fontconfig
-$(package)_config_opts_aarch64_android += -L $(host_prefix)/lib
-$(package)_config_opts_aarch64_android += -I $(host_prefix)/include
+$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
+$(package)_config_opts_x86_64_android += -android-arch x86_64
+$(package)_config_opts_i686_android += -android-arch i686
+
$(package)_build_env = QT_RCC_TEST=1
$(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1
endef