fix:build:Fix Codesigning with newer ndk image versions

navit-gps · Sep 6, 2020 · 6e25607 · 6e25607
1 parent 21fe6b8
commit 6e25607
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/navit/android/build.gradle b/navit/android/build.gradle
@@ -11,7 +11,7 @@ android {
             storeFile file(System.getenv("KEYSTORE")  ?: "/store")
             keyAlias System.getenv("KEY_ALIAS")
             storePassword System.getenv("STORE_PASS")
-            keyPassword System.getenv("KEY_PASS")
+            keyPassword System.getenv("STORE_PASS")
         }
     }
     defaultConfig {

diff --git a/scripts/setup_publish_keys.sh b/scripts/setup_publish_keys.sh
@@ -7,8 +7,7 @@ if [[ -n $GOOGLE_KEY ]]; then
 fi
 if [[ -n $KEY ]]; then
   wget "https://github.com/navit-gps/infrastructure-blackbox/raw/master/keyrings/keystore.gpg"
-  openssl aes-256-cbc -d -in keystore.gpg -md md5 -k $KEY > ~/.keystore
-  keytool -importkeystore -srcstorepass "$STORE_PASS" -deststorepass "$STORE_PASS" -srckeystore ~/.keystore -destkeystore ~/.keystore -deststoretype pkcs12
-  keytool -keypasswd -alias $KEY_ALIAS -storepass $STORE_PASS -new $KEY_PASS -keystore ~/.keystore
-  rm keystore.gpg
+  openssl aes-256-cbc -d -in keystore.gpg -md md5 -k $KEY > keystore
+  keytool -importkeystore -srcstorepass "$STORE_PASS" -deststorepass "$STORE_PASS" -srckeystore keystore -destkeystore ~/.keystore -deststoretype pkcs12
+  rm keystore.gpg keystore
 fi