From 3c373fbcfecffaaad368fb7efab649096703062c Mon Sep 17 00:00:00 2001
From: "alexandr.kravchenko" <alexander.kravchenko@demlabs.net>
Date: Sat, 8 Feb 2020 14:26:36 +0500
Subject: [PATCH] removed redundant android scripts
---
prod_build/android/essentials/key/creds.conf | 1 -
.../essentials/key/papizh-key/creds.conf | 2 -
.../essentials/key/papizh-key/release-key.jks | Bin 2270 -> 0 bytes
.../android/essentials/key/release-key.jks | 1 -
prod_build/android/scripts/build.sh | 50 ------------------
5 files changed, 54 deletions(-)
delete mode 120000 prod_build/android/essentials/key/creds.conf
delete mode 100644 prod_build/android/essentials/key/papizh-key/creds.conf
delete mode 100644 prod_build/android/essentials/key/papizh-key/release-key.jks
delete mode 120000 prod_build/android/essentials/key/release-key.jks
delete mode 100755 prod_build/android/scripts/build.sh
diff --git a/prod_build/android/essentials/key/creds.conf b/prod_build/android/essentials/key/creds.conf
deleted file mode 120000
index 1a2c7b5a..00000000
--- a/prod_build/android/essentials/key/creds.conf
+++ /dev/null
@@ -1 +0,0 @@
-papizh-key/creds.conf
\ No newline at end of file
diff --git a/prod_build/android/essentials/key/papizh-key/creds.conf b/prod_build/android/essentials/key/papizh-key/creds.conf
deleted file mode 100644
index 73848ff2..00000000
--- a/prod_build/android/essentials/key/papizh-key/creds.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-export ALIAS=pconst
-export PASS=B0yc3-K0dd
diff --git a/prod_build/android/essentials/key/papizh-key/release-key.jks b/prod_build/android/essentials/key/papizh-key/release-key.jks
deleted file mode 100644
index ef51c3a7812997e8616808daf41710720f11764d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2270
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
bR|e)T#}d=YTVMIVbZaA6jrOTSDjk0V1+Lrr
diff --git a/prod_build/android/essentials/key/release-key.jks b/prod_build/android/essentials/key/release-key.jks
deleted file mode 120000
index 94da3ecc..00000000
--- a/prod_build/android/essentials/key/release-key.jks
+++ /dev/null
@@ -1 +0,0 @@
-papizh-key/release-key.jks
\ No newline at end of file
diff --git a/prod_build/android/scripts/build.sh b/prod_build/android/scripts/build.sh
deleted file mode 100755
index 497d2cb0..00000000
--- a/prod_build/android/scripts/build.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. ./prod_build/general/pre-build.sh
-export_variables "./prod_build/android/conf/*"
-
-#read_conf.
-#src_path=$workdir/resources/SAP/sapnet-client
-#WORK_PATH=$wd/resources/SAP/sapnet-client-build
-SRC_DIR=$(pwd)
-RES_PATH=${SRC_DIR}/$RES_PATH
-exitcode=0
-
-echo "DexGuard tuning"
-[ -f "$RES_PATH/gradle.properties" ] || { echo "systemProp.dexguard.license=/usr/local/etc/dexguard-license.txt" >> $RES_PATH/gradle.properties && echo "enableDexGuard=true" >> $RES_PATH/gradle.properties ; }
-sed -i '/flatDir/s/'"'"'.*'"'"' }/'"'"'\/opt\/DexGuard\/DexGuard-8.2.12\/lib'"'"' }/' $RES_PATH/build.gradle
-mkdir -p $SRC_DIR/build/apk
-
-
-BRAND=`cat *.pro | grep "BRAND " | rev | cut -d " " -f1 | rev`
-echo "extracting version"
-VERSION=$(extract_version_number)
-echo "version number is $VERSION"
-. prod_build/android/essentials/key/creds.conf
-
-mkdir -p $WORK_PATH
-cd $WORK_PATH
-rm -rf *
-APK_PATH=android/build/outputs/apk
-echo "arch-versions are $ARCH_VERSIONS"
-IFS=" "
-for arch in $ARCH_VERSIONS; do
- mkdir -p $arch
- cd $arch
- export QT_SELECT=$arch
- ANDRQT_HOME=/usr/lib/crossdev/android-$arch/*/bin
- $ANDRQT_HOME/qmake -r -spec android-g++ CONFIG+=release CONFIG+=qml_release BRAND=$BRAND BRAND_TARGET=$BRAND $SRC_DIR/*.pro && \
- $ANDROID_NDK_HOME/prebuilt/$NDKHOST/bin/make -j3 && \
- $ANDROID_NDK_HOME/prebuilt/$NDKHOST/bin/make install INSTALL_ROOT=$(pwd)/android && \
- echo "Deploying in " && pwd && $ANDRQT_HOME/androiddeployqt --output android --verbose --input SapNetGui/*.json --sign $SRC_DIR/prod_build/android/essentials/key/release-key.jks $ALIAS --storepass $PASS --jdk $JAVA_HOME --gradle && \
- mv -v $(pwd)/$APK_PATH/android-release-signed.apk $SRC_DIR/build/apk/"$BRAND-${VERSION}_$arch.apk" || \
- exitcode=$?
- cd ..
- if [[ $exitcode != 0 ]]; then
- echo "Build failed with exit code $exitcode"
- cd $workdir
- exit $exitcode
- fi
-done
-
-cd $workdir
--
GitLab