bin/calabash-android-build.rb in calabash-android-0.7.3 vs bin/calabash-android-build.rb in calabash-android-0.7.4.pre1
- old
+ new
@@ -31,11 +31,10 @@
FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
unsigned_test_apk = File.join(File.dirname(__FILE__), '..', 'lib/calabash-android/lib/TestServer.apk')
test_server_manifest = File.join(File.dirname(__FILE__), '..', 'lib', 'calabash-android', 'lib', 'AndroidManifest.xml')
- android_platform = Env.android_platform_path
Dir.mktmpdir do |workspace_dir|
Dir.chdir(workspace_dir) do
FileUtils.cp(unsigned_test_apk, "TestServer.apk")
FileUtils.cp(test_server_manifest, "AndroidManifest.xml")
@@ -45,10 +44,10 @@
unless system %Q{"#{RbConfig.ruby}" -pi.bak -e "gsub(/#testPackage#/, '#{package_name(app)}.test')" AndroidManifest.xml}
raise "Could not replace test package name in manifest"
end
- unless system %Q{"#{Calabash::Android::Dependencies.aapt_path}" package -M AndroidManifest.xml -I "#{android_platform}/android.jar" -F dummy.apk}
+ unless system %Q{"#{Calabash::Android::Dependencies.aapt_path}" package -M AndroidManifest.xml -I "#{Calabash::Android::Dependencies.android_jar_path}" -F dummy.apk}
raise "Could not create dummy.apk"
end
Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
Zip::File.open("TestServer.apk") do |zip_file|