diff --git a/lib/motion/project/template/android.rb b/lib/motion/project/template/android.rb index d9ccd7c3..e180707b 100644 --- a/lib/motion/project/template/android.rb +++ b/lib/motion/project/template/android.rb @@ -80,7 +80,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved) return -1; } assert(env != NULL); - rb_vm_init("#{App.config.package.gsub('.', '/')}", env); + rb_vm_init("#{App.config.package_path}", env); EOS ruby_objs.each do |_, init_func| payload_c_txt << " #{init_func}(NULL, NULL);\n" @@ -294,6 +294,10 @@ def run_apk(mode) line = "\"#{adb_path}\" #{adb_mode_flag(mode)} shell am start -a android.intent.action.MAIN -n #{activity_path}" line << " > /dev/null" unless Rake.application.options.trace sh line + + # Show log. + sh "\"#{adb_path}\" #{adb_mode_flag(mode)} logcat -c" + sh "\"#{adb_path}\" #{adb_mode_flag(mode)} logcat #{App.config.package_path}:I" end end diff --git a/lib/motion/project/template/android/config.rb b/lib/motion/project/template/android/config.rb index d6e16166..4992db58 100644 --- a/lib/motion/project/template/android/config.rb +++ b/lib/motion/project/template/android/config.rb @@ -55,6 +55,10 @@ module Motion; module Project; @package ||= 'com.yourcompany' + '.' + name.downcase.gsub(/\s/, '') end + def package_path + App.config.package.gsub('.', '/') + end + def api_version @api_version ||= begin versions = Dir.glob(sdk_path + '/platforms/android-*').map do |path|