From 5451197a33cc202fdb0d68cedcf6e84d69fa167d Mon Sep 17 00:00:00 2001 From: Laurent Sansonetti Date: Sun, 27 Apr 2014 16:07:36 +0200 Subject: [PATCH] create the debug keystore regardless if we have to create the apk file --- lib/motion/project/template/android.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/motion/project/template/android.rb b/lib/motion/project/template/android.rb index 93d2adcf..d24b3b40 100644 --- a/lib/motion/project/template/android.rb +++ b/lib/motion/project/template/android.rb @@ -255,6 +255,13 @@ EOS EOS end + # Create the debug keystore if needed. + debug_keystore = File.expand_path('~/.android/debug.keystore') + unless File.exist?(debug_keystore) + App.info 'Create', debug_keystore + sh "/usr/bin/keytool -genkeypair -alias androiddebugkey -keypass android -keystore \"#{debug_keystore}\" -storepass android -dname \"CN=Android Debug,O=Android,C=US\" -validity 9999" + end + # Generate the APK file. archive = App.config.apk_path if !File.exist?(archive) or File.mtime(dex_classes) > File.mtime(archive) or File.mtime(libpayload_path) > File.mtime(archive) @@ -269,13 +276,6 @@ EOS end end - # Create the debug keystore if needed. - debug_keystore = File.expand_path('~/.android/debug.keystore') - unless File.exist?(debug_keystore) - App.info 'Create', debug_keystore - sh "/usr/bin/keytool -genkeypair -alias androiddebugkey -keypass android -keystore \"#{debug_keystore}\" -storepass android -dname \"CN=Android Debug,O=Android,C=US\" -validity 9999" - end - App.info 'Sign', archive sh "/usr/bin/jarsigner -storepass android -keystore \"#{debug_keystore}\" \"#{archive}\" androiddebugkey"