From 9d1d5ab5335dcfae034fb7b22e6fd59ca3f3d1bc Mon Sep 17 00:00:00 2001 From: jandegr Date: Tue, 28 Feb 2017 15:49:24 +0100 Subject: Fix apk signing and bump sdk to 25 - nougat (#209) * Update build_android_x86.sh * Update build_android.sh * Update build_android_x86.sh * Update publish.sh * Update build_android.sh * Update circle.yml * Update publish.sh * Update publish.sh * Update publish.sh * use apksigner instead of jarsigner * Update circle.yml * revert to jarsigner * Update build_android.sh * Update publish.sh --- ci/build_android.sh | 2 +- ci/build_android_x86.sh | 4 ++-- ci/publish.sh | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/build_android.sh b/ci/build_android.sh index dc858e2ca..93e250f95 100644 --- a/ci/build_android.sh +++ b/ci/build_android.sh @@ -20,7 +20,7 @@ cd $BUILD_PATH android list targets -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH make if [[ "${CIRCLE_BRANCH}" == "master" ]]; then diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh index c5a421cbe..30ced4296 100644 --- a/ci/build_android_x86.sh +++ b/ci/build_android_x86.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -export arch="x86" +export ARCH="x86" export START_PATH=~/ export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/" export CMAKE_FILE=$SOURCE_PATH"/Toolchain/i686-android.cmake" @@ -20,7 +20,7 @@ cd $BUILD_PATH android list targets -cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=23 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH +cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH make if [[ "${CIRCLE_BRANCH}" == "master" ]]; then diff --git a/ci/publish.sh b/ci/publish.sh index 362411e6b..a92f620b8 100644 --- a/ci/publish.sh +++ b/ci/publish.sh @@ -9,6 +9,9 @@ openssl aes-256-cbc -d -in androidpublisher.gpg -k $KEY > androidpublisher.dat pip install google-api-python-client -/usr/lib/jvm/java-8-openjdk-amd64/bin/jarsigner -storepass $SP $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $key_name +jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $SP $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $key_name + /usr/local/android-sdk-linux/build-tools/25.0.1/zipalign 4 $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk +# /usr/local/android-sdk-linux/build-tools/25.0.1/apksigner sign -v --ks-pass pass:$SP --key $key_name $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk +/usr/local/android-sdk-linux/build-tools/25.0.1/apksigner verify -v $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk python ~/navit/ci/basic_upload_apks.py org.navitproject.navit $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-signed.apk -- cgit v1.2.1