From 471facd344517b330fb388f07023feb36a6290cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 14 Sep 2020 12:58:54 -0400
Subject: [PATCH] build: generate native symbols file
Change-Id: I4e61ae2ce6d22ff05144058fff6c0383050a2d7a
---
compile.sh | 22 ++++++++--------------
fdroidMergeRequest.sh | 2 +-
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/compile.sh b/compile.sh
index 497f11a4b..4087bcb0f 100755
--- a/compile.sh
+++ b/compile.sh
@@ -15,7 +15,6 @@ TOP=$(pwd)/ring-android
RELEASE=0
DAEMON_ONLY=0
-NO_GRADLE=0
for i in ${@}; do
case "$i" in
release|--release)
@@ -24,15 +23,11 @@ for i in ${@}; do
daemon|--daemon)
DAEMON_ONLY=1
;;
- no-gradle|--no-gradle)
- NO_GRADLE=1
- ;;
*)
;;
esac
done
export RELEASE
-export DAEMON_ONLY
ANDROID_ABI_LIST="${ANDROID_ABI}"
echo "Building ABIs: ${ANDROID_ABI_LIST}"
@@ -43,20 +38,19 @@ for i in ${ANDROID_ABI_LIST}; do
echo "$i build OK"
done
-if [[ $NO_GRADLE -eq 0 ]]; then
+if [[ $DAEMON_ONLY -eq 0 ]]; then
if [ -z "$RING_BUILD_FIREBASE" ]; then
echo "Building without Firebase support"
else
GRADLE_PROPERTIES="-PbuildFirebase"
echo "Building with Firebase support"
fi
- if [[ $DAEMON_ONLY -eq 0 ]]; then
- if [[ $RELEASE -eq 1 ]]; then
- cd $TOP && gradle $GRADLE_PROPERTIES assembleRelease
- else
- cd $TOP && gradle $GRADLE_PROPERTIES assembleDebug
- fi
+ if [[ $RELEASE -eq 1 ]]; then
+ echo "Archiving native debug symbols"
+ cd $TOP/app/src/main/libs
+ zip -r $TOP/app/symbols.zip .
+ cd $TOP && gradle $GRADLE_PROPERTIES assembleRelease
+ else
+ cd $TOP && gradle $GRADLE_PROPERTIES assembleDebug
fi
-else
- echo "Stopping before gradle build as requested."
fi
diff --git a/fdroidMergeRequest.sh b/fdroidMergeRequest.sh
index 74f5f17dc..d6990d01e 100755
--- a/fdroidMergeRequest.sh
+++ b/fdroidMergeRequest.sh
@@ -77,7 +77,7 @@ echo " - versionName: ${versionName}
- cd ../..
- export ANDROID_NDK_ROOT=\"\$ANDROID_NDK\"
- export ANDROID_ABI=\"armeabi-v7a arm64-v8a x86\"
- - ./compile.sh --release --no-gradle
+ - ./compile.sh --release --daemon
ndk: ${ndkVersion}" >> ${METADATA_FOLDER}/cx.ring.yml
--
GitLab