Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* Include dexmaker.jar in all apps until it is available in RubotoCore.

  • Loading branch information...
commit 938d3452c10c7db8f55d1bbdfad2e2b1e08bdd83 1 parent 53c17a4
@donv donv authored
View
3  android_api.txt
@@ -0,0 +1,3 @@
+https://raw.github.com/android/platform_frameworks_base/master/api/7.xml
+https://raw.github.com/android/platform_frameworks_base/master/api/8.xml
+https://raw.github.com/android/platform_frameworks_base/master/api/13.xml
View
7 lib/ruboto/util/update.rb
@@ -188,9 +188,9 @@ def update_jruby(force=nil)
log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs" }
# FIXME(uwe): Try keeping the class count low to enable installation on Android 2.3 devices
- unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
+ # unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
log_action("Copying dexmaker.jar to libs") { copier.copy 'libs' }
- end
+ # end
reconfigure_jruby_libs(new_jruby_version)
@@ -205,7 +205,8 @@ def update_dexmaker(force=nil)
# return false if !jar_file && !force
copier = AssetCopier.new Ruboto::ASSETS, File.expand_path(".")
- log_action("Removing #{jar_file}") { File.delete *Dir.glob("libs/dexmaker*.jar") } if jar_file
+ # FIXME(uwe): Skip copying dexmaker to apps using RubotoCore when we include dexmaker.jar in RubotoCore
+ # log_action("Removing #{jar_file}") { File.delete *Dir.glob("libs/dexmaker*.jar") } if jar_file
# FIXME(uwe): Try keeping the class count low to enable installation on Android 2.3 devices
# FIXME(uwe): Skip copying dexmaker to apps using RubotoCore when we include dexmaker.jar in RubotoCore
View
12 test/test_helper.rb
@@ -209,12 +209,12 @@ def generate_app(options = {})
# FIXME(uwe): Installation with dexmaker fails on Android < 4.0.3 due to complex interface structure
# Fixme(uwe): Remove when solved
- if standalone && ANDROID_OS < 15
- Dir.chdir APP_DIR do
- puts "Removing dexmaker jar for android-#{ANDROID_OS}"
- FileUtils.rm(Dir['libs/dexmaker*.jar'])
- end
- end
+ #if standalone && ANDROID_OS < 15
+ # Dir.chdir APP_DIR do
+ # puts "Removing dexmaker jar for android-#{ANDROID_OS}"
+ # FileUtils.rm(Dir['libs/dexmaker*.jar'])
+ # end
+ #end
# EMXIF
unless example && !update
Please sign in to comment.
Something went wrong with that request. Please try again.