From 16ebf7bb11dd3562f5c61819afc56ab0244e36d0 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Sat, 10 Aug 2019 12:25:57 +0100 Subject: [PATCH] build 32-bit and 64-bit APKs --- .gitlab-ci.yml | 59 +++- buildozer.spec.arm.ci | 274 +++++++++++++++++++ buildozer.spec.ci => buildozer.spec.arm64.ci | 0 3 files changed, 321 insertions(+), 12 deletions(-) create mode 100644 buildozer.spec.arm.ci rename buildozer.spec.ci => buildozer.spec.arm64.ci (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33fef2b0..820100dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,8 @@ stages: - build - deploy - release - -build apk: + +build arm64 apk: stage: build image: lbry/android-base:latest before_script: @@ -12,7 +12,37 @@ build apk: - git submodule update --init --force --recursive artifacts: paths: - - bin/browser-*-release.apk + - bin/browser-*-release__arm64.apk + expire_in: 1 week + script: + - export PATH=/usr/bin:$PATH + - echo "$PGP_PRIVATE_KEY" | gpg --batch --import + - cd app + - npm install + - cd .. + - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/ + - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/ + - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 + - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh + - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h + - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz + - git secret reveal + - mv buildozer.spec.arm64.ci buildozer.spec + - "./release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered" + - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm64.apk + - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk /dev/null + +build arm apk: + stage: build + image: lbry/android-base:latest + before_script: + - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') + - git submodule sync --recursive + - git submodule update --init --force --recursive + artifacts: + paths: + - bin/browser-*-release__arm.apk expire_in: 1 week script: - export PATH=/usr/bin:$PATH @@ -26,25 +56,28 @@ build apk: - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9 - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls__arm64.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm64/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz - git secret reveal - - mv buildozer.spec.ci buildozer.spec + - mv buildozer.spec.arm.ci buildozer.spec - "./release.sh | grep -Fv -e 'working:' -e 'copy' -e 'Compiling' --line-buffered" + - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm.apk - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release.apk /dev/null deploy build.lbry.io: image: python:latest stage: deploy dependencies: - - build apk + - build arm apk + - build arm64 apk before_script: - pip install awscli - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - - export BUILD_APK_FILENAME=browser-$BUILD_VERSION-release.apk + - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk + - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk script: - - aws s3 cp bin/$BUILD_APK_FILENAME s3://build.lbry.io/android/build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME - - aws s3 cp bin/$BUILD_APK_FILENAME s3://build.lbry.io/android/push.apk + - aws s3 cp bin/$BUILD_APK_FILENAME__64 s3://build.lbry.io/android/build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__64 + - aws s3 cp bin/$BUILD_APK_FILENAME__32 s3://build.lbry.io/android/build-${CI_PIPELINE_IID}_commit-${CI_COMMIT_SHA:0:7}/$BUILD_APK_FILENAME__32 + - aws s3 cp bin/$BUILD_APK_FILENAME__64 s3://build.lbry.io/android/push.apk release apk: image: python:latest @@ -52,11 +85,13 @@ release apk: only: - tags dependencies: - - build apk + - build arm apk + - build arm64 apk before_script: - pip install awscli githubrelease - export BUILD_VERSION=$(cat $CI_PROJECT_DIR/src/main/python/main.py | grep --color=never -oP '([0-9]+\.?)+') - - export BUILD_APK_FILENAME=browser-$BUILD_VERSION-release.apk + - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk + - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk script: - - githubrelease release lbryio/lbry-android create $CI_COMMIT_TAG --publish bin/$BUILD_APK_FILENAME + - githubrelease release lbryio/lbry-android create $CI_COMMIT_TAG --publish bin/$BUILD_APK_FILENAME__64 bin/$BUILD_APK_FILENAME__32 - aws s3 cp bin/$BUILD_APK_FILENAME s3://build.lbry.io/android/latest.apk diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci new file mode 100644 index 00000000..13ee70cc --- /dev/null +++ b/buildozer.spec.arm.ci @@ -0,0 +1,274 @@ +[app] + +# (str) Title of your application +title = LBRY + +# (str) Package name +package.name = browser + +# (str) Package domain (needed for android/ios packaging) +package.domain = io.lbry + +# (str) Source code where the main.py live +source.dir = ./src/main/python + +# (list) Source files to include (let empty to include all the files) +source.include_exts = py,png,jpg,kv,atlas + +# (list) List of inclusions using pattern matching +#source.include_patterns = assets/*, res/* + +# (list) Source files to exclude (let empty to not exclude anything) +#source.exclude_exts = spec + +# (list) List of directory to exclude (let empty to not exclude anything) +#source.exclude_dirs = tests, bin + +# (list) List of exclusions using pattern matching +#source.exclude_patterns = license,images/*/*.jpg + +# (str) Application versioning (method 1) +#version = 0.1 + +# (str) Application versioning (method 2) +version.regex = __version__ = ['"](.*)['"] +version.filename = %(source.dir)s/main.py + +# (list) Application requirements +# comma seperated e.g. requirements = sqlite3,kivy +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, "git+https://github.com/lbryio/lbry-sdk@v0.38.6#egg=lbry&subdirectory=lbry", "git+https://github.com/lbryio/lbry-sdk@v0.38.6#egg=torba&subdirectory=torba" + +# (str) Custom source folders for requirements +# Sets custom source for any requirements with recipes +# requirements.source.kivy = ../../kivy + +# (list) Garden requirements +#garden_requirements = + +# (str) Presplash of the application +#presplash.filename = %(source.dir)s/data/presplash.png + +# (str) Icon of the application +#icon.filename = %(source.dir)s/data/icon.png + +# (str) Supported orientation (one of landscape, portrait or all) +orientation = portrait + +# (list) List of service to declare +#services = NAME:ENTRYPOINT_TO_PY,NAME2:ENTRYPOINT2_TO_PY +services = lbrynetservice:./lbrynetservice.py + +# +# OSX Specific +# + +# +# author = © Copyright Info + +# change the major version of python used by the app +osx.python_version = 3 + +# Kivy version to use +osx.kivy_version = 1.9.1 + +# +# Android specific +# + +# (bool) Indicate if the application should be fullscreen or not +fullscreen = 0 + +# (string) Presplash background color (for new android toolchain) +# Supported formats are: #RRGGBB #AARRGGBB or one of the following names: +# red, blue, green, black, white, gray, cyan, magenta, yellow, lightgray, +# darkgray, grey, lightgrey, darkgrey, aqua, fuchsia, lime, maroon, navy, +# olive, purple, silver, teal. +#android.presplash_color = #FFFFFF + +# (list) Permissions +android.permissions = CAMERA,INTERNET,READ_EXTERNAL_STORAGE,RECORD_AUDIO,WRITE_EXTERNAL_STORAGE + +# (int) Android API to use +android.api = 28 + +# (int) Minimum API required +android.minapi = 21 + +# (int) Android SDK version to use +android.sdk = 23 + +# (str) Android NDK version to use +#android.ndk = 13b + +# (bool) Use --private data storage (True) or --dir public storage (False) +#android.private_storage = True + +# (str) Android NDK directory (if empty, it will be automatically downloaded.) +android.ndk_path = ~/.buildozer/android/crystax-ndk-10.3.2 + +# (str) Android SDK directory (if empty, it will be automatically downloaded.) +#android.sdk_path = ~/.buildozer/android + +# (str) ANT directory (if empty, it will be automatically downloaded.) +#android.ant_path = + +# (bool) If True, then skip trying to update the Android sdk +# This can be useful to avoid excess Internet downloads or save time +# when an update is due and you just want to test/build your package +#android.skip_update = False + +# (str) Android entry point, default is ok for Kivy-based app +#android.entrypoint = org.renpy.android.PythonActivity + +# (list) Pattern to whitelist for the whole project +#android.whitelist = + +# (str) Path to a custom whitelist file +#android.whitelist_src = + +# (str) Path to a custom blacklist file +#android.blacklist_src = + +# (list) List of Java .jar files to add to the libs so that pyjnius can access +# their classes. Don't add jars that you do not need, since extra jars can slow +# down the build process. Allows wildcards matching, for example: +# OUYA-ODK/libs/*.jar +#android.add_jars = foo.jar,bar.jar,path/to/more/*.jar + +# (list) List of Java files to add to the android project (can be java or a +# directory containing the files) +android.add_src = ./src/main + +# (str) Path to the React files and node_modules for building +android.react_src = ./app + +# (list) Android AAR archives to add (currently works only with sdl2_gradle +# bootstrap) +#android.add_aars = + +# (list) Gradle dependencies to add (currently works only with sdl2_gradle +# bootstrap) +android.gradle_dependencies = com.android.support:support-v4:27.1.1, com.android.support:support-media-compat:27.1.1, com.android.support:appcompat-v7:27.1.1, com.facebook.react:react-native:0.59.10, com.google.android.gms:play-services-gcm:11.0.4+, com.facebook.fresco:fresco:1.9.0, com.facebook.fresco:animated-gif:1.9.0, com.squareup.picasso:picasso:2.71828, com.google.firebase:firebase-core:16.0.1, com.google.android.gms:play-services-base:16.1.0, com.android.support:exifinterface:27.1.1 + +# (str) python-for-android branch to use, defaults to master +#p4a.branch = stable + +# (str) OUYA Console category. Should be one of GAME or APP +# If you leave this blank, OUYA support will not be enabled +#android.ouya.category = GAME + +# (str) Filename of OUYA Console icon. It must be a 732x412 png image. +#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png + +# (str) XML file to include as an intent filters in tag +#android.manifest.intent_filters = + +# (list) Android additionnal libraries to copy into libs/armeabi +#android.add_libs_armeabi = libs/android-v7/* +#android.add_libs_armeabi_v7a = libs/android-v7/* +#android.add_libs_x86 = libs/android-x86/*.so +#android.add_libs_mips = libs/android-mips/*.so + +# (bool) Indicate whether the screen should stay on +# Don't forget to add the WAKE_LOCK permission if you set this to True +#android.wakelock = False + +# (list) Android application meta-data to set (key=value format) +#android.meta_data = + +# (list) Android library project to add (will be added in the +# project.properties automatically.) +#android.library_references = + +# (str) Android logcat filters to use +#android.logcat_filters = *:S python:D + +# (bool) Copy library instead of making a libpymodules.so +#android.copy_libs = 1 + +# (str) The Android arch to build for, choices: armeabi-v7a, arm64-v8a, x86 +android.arch = armeabi-v7a + +# +# Python for android (p4a) specific +# + +# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github) +p4a.source_dir = ./p4a + +# (str) The directory in which python-for-android should look for your own build recipes (if any) +p4a.local_recipes = ./recipes + +# (str) Filename to the hook for p4a +#p4a.hook = + +# (str) Bootstrap to use for android builds +p4a.bootstrap = lbry + + +# +# iOS specific +# + +# (str) Path to a custom kivy-ios folder +#ios.kivy_ios_dir = ../kivy-ios + +# (str) Name of the certificate to use for signing the debug version +# Get a list of available identities: buildozer ios list_identities +#ios.codesign.debug = "iPhone Developer: ()" + +# (str) Name of the certificate to use for signing the release version +#ios.codesign.release = %(ios.codesign.debug)s + + +[buildozer] + +# (int) Log level (0 = error only, 1 = info, 2 = debug (with command output)) +log_level = 2 + +# (int) Display warning if buildozer is run as root (0 = False, 1 = True) +warn_on_root = 1 + +# (str) Path to build artifact storage, absolute or relative to spec file +# build_dir = ./.buildozer + +# (str) Path to build output (i.e. .apk, .ipa) storage +# bin_dir = ./bin + +# ----------------------------------------------------------------------------- +# List as sections +# +# You can define all the "list" as [section:key]. +# Each line will be considered as a option to the list. +# Let's take [app] / source.exclude_patterns. +# Instead of doing: +# +#[app] +#source.exclude_patterns = license,data/audio/*.wav,data/images/original/* +# +# This can be translated into: +# +#[app:source.exclude_patterns] +#license +#data/audio/*.wav +#data/images/original/* +# + + +# ----------------------------------------------------------------------------- +# Profiles +# +# You can extend section / key with a profile +# For example, you want to deploy a demo version of your application without +# HD content. You could first change the title to add "(demo)" in the name +# and extend the excluded directories to remove the HD content. +# +#[app@demo] +#title = My Application (demo) +# +#[app:source.exclude_patterns@demo] +#images/hd/* +# +# Then, invoke the command line with the "demo" profile: +# +#buildozer --profile demo android debug diff --git a/buildozer.spec.ci b/buildozer.spec.arm64.ci similarity index 100% rename from buildozer.spec.ci rename to buildozer.spec.arm64.ci