From d09b60c4299b8e6a66a892e459cae51f0ee5aee6 Mon Sep 17 00:00:00 2001 From: Dmitry Puzyrkov <dmitry.puzyrkov@demlabs.net> Date: Fri, 23 Aug 2024 09:46:13 +0000 Subject: [PATCH] [+] android build pipes --- .gitlab-ci.yml | 8 ++++++++ dap-sdk | 2 +- modules/wallet/dap_chain_wallet.c | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a87c39556..c81ec7e9c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,3 +82,11 @@ build:macos: script: - mkdir build - cd build && $(${OSXCROSS_ROOT}/bin/osxcross-conf) && export OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 && export OSXCROSS_HOST=x86_64-apple-darwin20.4 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${OSXCROSS_ROOT}/toolchain.cmake -DBoost_INCLUDE_DIR=$BOOST_INCLUDE_DIR .. && make -j$(nproc) + + +build:android: + extends: .tests + image: demlabs/android/any:qt5 + before_script: /opt/buildtools/prepare_environment.sh amd64-windows + script: + - ./prod_build/build.sh --target android diff --git a/dap-sdk b/dap-sdk index 76bb290ca9..0da8b02fe2 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit 76bb290ca9d93e5adac3a56a32d42bc94ad354c5 +Subproject commit 0da8b02fe25253e36f14b13d22f23c88496a7ccf diff --git a/modules/wallet/dap_chain_wallet.c b/modules/wallet/dap_chain_wallet.c index c341711cdb..25892281a3 100644 --- a/modules/wallet/dap_chain_wallet.c +++ b/modules/wallet/dap_chain_wallet.c @@ -63,7 +63,7 @@ //#define __USE_GNU -#if defined(__USE_BSD) || defined(__USE_GNU) +#if defined(__USE_BSD) || defined(__USE_GNU) || defined(DAP_OS_ANDROID) #define S_IREAD S_IRUSR #define S_IWRITE S_IWUSR #define S_IEXEC S_IXUSR -- GitLab