calabash-android-run.rb in calabash-android-0.8.0.pre2

- old
+ new

@@ -15,14 +15,14 @@
   if app_path
     build_test_server_if_needed(app_path)
 
     test_server_path = test_server_path(app_path)
 
-    main_activity = ENV['MAIN_ACTIVITY'] || main_activity(app_path)
+    env = "APP_PATH=\"#{app_path}\" TEST_APP_PATH=\"#{test_server_path}\""
 
-    env = "MAIN_ACTIVITY=#{main_activity} "\
-          "APP_PATH=\"#{app_path}\" "\
-          "TEST_APP_PATH=\"#{test_server_path}\""
+    if ENV['MAIN_ACTIVITY']
+      env = "#{env} MAIN_ACTIVITY=#{ENV['MAIN_ACTIVITY']}"
+    end
   else
     env = ""
   end
 
   STDOUT.sync = true
\ No newline at end of file