Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-android
Commits
3b4c0195
Commit
3b4c0195
authored
2 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
build: adapt for Android NDK r25
Change-Id: Id52bc4ebee89d5779e153be8d5e6678527dc7cfc
parent
33ac961e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
build-daemon.sh
+5
-3
5 additions, 3 deletions
build-daemon.sh
docker/Dockerfile
+2
-2
2 additions, 2 deletions
docker/Dockerfile
ring-android/app/build.gradle.kts
+1
-1
1 addition, 1 deletion
ring-android/app/build.gradle.kts
with
8 additions
and
6 deletions
build-daemon.sh
+
5
−
3
View file @
3b4c0195
...
...
@@ -13,7 +13,8 @@ if [ -z "$ANDROID_ABI" ]; then
fi
platform
=
$(
echo
"
`
uname
`
"
|
tr
'[:upper:]'
'[:lower:]'
)
arch
=
`
uname
-m
`
arch
=
'x86_64'
#arch=`uname -m`
ANDROID_TOPLEVEL_DIR
=
"
`
pwd
`
"
ANDROID_APP_DIR
=
"
${
ANDROID_TOPLEVEL_DIR
}
/ring-android"
...
...
@@ -89,7 +90,7 @@ PACKAGEDIR=$ANDROID_APP_DIR/libjamiclient/src/main/java/net/jami/daemon $JNIDIR/
# Setup cross-compilation build environemnt
export
AR
=
$TOOLCHAIN
/bin/llvm-ar
export
AS
=
$TOOLCHAIN
/bin/
$TARGET
-as
export
AS
=
"
$TOOLCHAIN
/bin/
$TARGET
_CC$API
-clang -c"
export
CC
=
$TOOLCHAIN
/bin/
$TARGET_CC$API
-clang
export
CXX
=
$TOOLCHAIN
/bin/
$TARGET_CC$API
-clang
++
export
LD
=
$TOOLCHAIN
/bin/ld
...
...
@@ -185,7 +186,8 @@ STATIC_LIBS_ALL="-llog -lOpenSLES -landroid \
LIBRING_JNI_DIR
=
${
ANDROID_APP_DIR
}
/app/src/main/libs/
${
ANDROID_ABI
}
LIBRING_JNI_UNSTRIPPED_DIR
=
${
ANDROID_APP_DIR
}
/unstripped/
${
ANDROID_ABI
}
LIBCPP
=
$ANDROID_NDK
/sources/cxx-stl/llvm-libc++/libs/
${
ANDROID_ABI
}
/libc++_shared.so
#LIBCPP=$ANDROID_NDK/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so
LIBCPP
=
$TOOLCHAIN
/sysroot/usr/lib/
$TARGET
/libc++_shared.so
echo
"Building Jami JNI library for Android to
${
LIBRING_JNI_DIR
}
"
mkdir
-p
${
LIBRING_JNI_DIR
}
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
2
−
2
View file @
3b4c0195
...
...
@@ -70,9 +70,9 @@ RUN (while sleep 1; do echo "y"; done) | sdkmanager --channel=1 --sdk_root=${AND
'platforms;android-32'
\
'extras;android;m2repository'
\
'extras;google;m2repository'
\
'ndk;2
3.2.8568313
'
'ndk;2
5.0.8775105
'
ENV
ANDROID_SDK=${ANDROID_HOME}
ENV
ANDROID_NDK=${ANDROID_HOME}/ndk/2
3.2.8568313
ENV
ANDROID_NDK=${ANDROID_HOME}/ndk/2
5.0.8775105
# Fastlane
RUN
gem
install
fastlane
-NV
...
...
This diff is collapsed.
Click to expand it.
ring-android/app/build.gradle.kts
+
1
−
1
View file @
3b4c0195
...
...
@@ -14,7 +14,7 @@ plugins {
android
{
compileSdk
=
32
buildToolsVersion
=
"32.0.0"
ndkVersion
=
"2
3.2.8568313
"
ndkVersion
=
"2
5.0.8528842
"
defaultConfig
{
minSdk
=
21
targetSdk
=
32
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment