trunk build, ndk r23c, target 32

Signed-off-by: r4sas <r4sas@i2pmail.org>
This commit is contained in:
r4sas
2022-12-18 21:26:14 +00:00
parent b003a07f1b
commit 57fef00c48
7 changed files with 23 additions and 23 deletions
+11 -11
View File
@@ -21,15 +21,15 @@ jobs:
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
build-tools;31.0.0
platforms;android-31
ndk;21.4.7075529
cmake;3.18.1
build-tools;32.0.0
platforms;android-32
ndk;23.2.8568313
cmake;3.22.1
cache: true
- name: Build required modules
run: |
export ANDROID_SDK_ROOT=$ANDROID_HOME
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd app/jni
./build_boost.sh
./build_openssl.sh
@@ -40,7 +40,7 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: android-apks.zip
name: android-apks
path: app/build/outputs/apk/debug/*.apk
build-binary:
@@ -61,13 +61,13 @@ jobs:
uses: maxim-lobanov/setup-android-tools@v1
with:
packages: |
ndk;21.4.7075529
cmake;3.18.1
ndk;23.2.8568313
cmake;3.22.1
cache: true
- name: Build required modules
run: |
export ANDROID_SDK_ROOT=$ANDROID_HOME
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/21.4.7075529
export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313
pushd binary/jni
./build_boost.sh
./build_openssl.sh
@@ -86,10 +86,10 @@ jobs:
- name: Upload binaries archive
uses: actions/upload-artifact@v2
with:
name: android-binaries.zip
name: android-binaries
path: binary/libs/*
- name: Upload binaries package
uses: actions/upload-artifact@v2
with:
name: android-binaries-pack.zip
name: android-binaries-pack
path: contrib/binary_pack/i2pd_*_android_binary.zip
+3 -3
View File
@@ -8,16 +8,16 @@ dependencies {
}
android {
compileSdkVersion 29
compileSdkVersion 32
defaultConfig {
applicationId "org.purplei2p.i2pd"
targetSdkVersion 29
targetSdkVersion 32
minSdkVersion 16
versionCode 2440000
versionName "2.44.0"
archivesBaseName += "-$versionName"
ndkVersion "21.4.7075529"
ndkVersion "23.2.8568313"
ndk {
abiFilters "armeabi-v7a"
+2 -4
View File
@@ -2,12 +2,10 @@
set -e
BOOST_VERSION=1.74.0
BOOST_VERSION=1.78.0
BOOST_LIBS=date_time,filesystem,program_options,system
function build_one {
mkdir out
echo "Configuring and building..."
CXXFLAGS="-std=c++14" \
NCPU=$(nproc) \
@@ -70,10 +68,10 @@ function build {
checkPreRequisites
cd boost
rm -rf out
# disable verbose output
sed -i -e 's/d+2/d+0/' build-android.sh
sed -i -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh
if (( $# == 0 )); then
build all
+1 -1
View File
@@ -2,7 +2,7 @@
set -e
CMAKE_VERSION=3.18.1
CMAKE_VERSION=3.22.1
function build_one {
mkdir -p build out/$CPU
+4 -2
View File
@@ -38,14 +38,16 @@
<receiver
android:name=".NetworkStateChangeReceiver"
android:label="NetworkChangeReceiver" >
android:label="NetworkChangeReceiver"
android:exported="true" >
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
</receiver>
<activity
android:name=".I2PDPermsAskerActivity">
android:name=".I2PDPermsAskerActivity"
android:exported="false" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />