rhodes 6.2.0 → 7.1.17

data/platform/android/build/RhodesSRC_build.files

@@ -19,6 +19,13 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/PasswordDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SecurityTokenGenerator.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMain.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubyArrayObjects.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubyClassObject.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubyObject.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubySingleton.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoRubyTypes.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/api/IMethodResult.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/api/IRhoApiDefaultId.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/api/IRhoApiFactory.java
@@ -120,5 +127,6 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunction
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality09.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality10.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality11.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality26.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/OsVersionManager.java

data/platform/android/build/android.rake

@@ -39,6 +39,7 @@ require 'tempfile'
 include FileUtils
 
 USE_OWN_STLPORT = false
+$rhodes_as_lib = false
 #USE_TRACES = # see androidcommon.rb
 
 def get_market_version(apilevel)
@@ -80,9 +81,14 @@ ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
 
 def set_app_icon_android
 
+  if $rhodes_as_lib 
+    puts "Skip building copy resources (not needed for aar library)"
+    return
+  end
+
   res_path = File.join($app_path, 'resources', 'android', 'res')
   if File.exists? res_path
-    # NEW resource - just copy it to res folder
+    # NEW resource - just copy it to res folder -->>
     puts "add resources from application'sresource folder [#{res_path}] to [#{$tmpdir}]"
     cp_r res_path, $tmpdir
 
@@ -149,6 +155,10 @@ def set_app_name_android(newname)
   rm_rf $appres
   cp_r $rhores, $appres
 
+  buildToolsVerMajor = $build_tools_ver.split('.')[0].to_i
+  canRenderNetworkSecurityConfig = (($found_api_level.to_i >= 24) && (buildToolsVerMajor>=24))
+  rm_rf File.join($appres, 'xml', 'network_security_config.xml') if(!canRenderNetworkSecurityConfig)
+
   rhostrings = File.join($rhores, "values", "strings.xml")
   appstrings = File.join($appres, "values", "strings.xml")
   doc = REXML::Document.new(File.new(rhostrings))
@@ -156,6 +166,17 @@ def set_app_name_android(newname)
   File.open(appstrings, "w") { |f| doc.write f }
 end
 
+def set_app_name_android_post(newname)
+  puts "set_app_name_post"
+
+  Dir.glob(File.join($appres, '**', 'strings.xml')).each do |res|
+    doc = REXML::Document.new(File.new(res))
+    doc.elements["resources/string[@name='app_name']"].text = newname
+    rm_rf res
+    File.open(res, "w") { |f| doc.write f }
+  end
+end
+
 
 def get_boolean(arg)
   arg == 'true' or arg == 'yes' or arg == 'enabled' or arg == 'enable' or arg == '1'
@@ -443,7 +464,7 @@ def setup_ext_env( extpath, extname )
   env["RHO_APP_DIR"] = $app_path
   env["ANDROID_SDK"] = $androidsdkpath
   env["ANDROID_NDK"] = $androidndkpath
-  env["ANDROID_API_LEVEL"] = $found_api_level.to_s
+  env["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
   env["RHO_ROOT"] = $startdir
   env["BUILD_DIR"] ||= $startdir + "/platform/android/build"
   env["RHO_INC"] = $appincdir
@@ -461,6 +482,30 @@ def setup_ext_env( extpath, extname )
   env
 end
 
+def get_android_major_minor(version)
+  puts version
+  if version.include? '.' then
+     array_ver = []
+     array_ver = version.split('.')
+     if array_ver.length >= 2 then 
+       $major_version = array_ver[0].to_i
+       $minor_version = array_ver[1].to_i
+     end
+     return
+  end
+
+  $major_version = version.to_i
+end
+
+def get_case_insensetive_property(property)
+  $app_config["android"].each do |x|
+    if (x[0].downcase == property.downcase)
+      return x[1]
+    end
+  end
+  return nil
+end
+
 namespace "config" do
   task :set_android_platform do
     $current_platform = "android"
@@ -500,15 +545,18 @@ namespace "config" do
       end
     end
 
-    $min_sdk_level = $app_config["android"]["minSDK"] unless $app_config["android"].nil?
-    $min_sdk_level = $config["android"]["minSDK"] if $min_sdk_level.nil? and not $config["android"].nil?
+    $min_sdk_level = get_case_insensetive_property("minSDK") unless $app_config["android"].nil?
+    $min_sdk_level = get_case_insensetive_property("minSDK") if $min_sdk_level.nil? and not $config["android"].nil?
+    $min_sdk_level = get_case_insensetive_property("minSdkVer") if $min_sdk_level.nil?
     $min_sdk_level = $min_sdk_level.to_i unless $min_sdk_level.nil?
     $min_sdk_level = ANDROID_MIN_SDK_LEVEL if $min_sdk_level.nil?
 
-
-    $target_sdk_level = $app_config["android"]["targetSDK"] unless $app_config["android"].nil?
-    $target_sdk_level = $config["android"]["targetSDK"] if $target_sdk_level.nil? and not $config["android"].nil?
+    
+    $target_sdk_level = get_case_insensetive_property("targetSdk") unless $app_config["android"].nil?
+    $target_sdk_level = get_case_insensetive_property("targetSdk") if $target_sdk_level.nil? and not $config["android"].nil?
+    $target_sdk_level = get_case_insensetive_property("targetSdkVer") if $target_sdk_level.nil?
     $target_sdk_level = $target_sdk_level.to_i unless $target_sdk_level.nil?
+
     $target_sdk_level = ANDROID_SDK_LEVEL if $target_sdk_level.nil?
 
     $max_sdk_level = $app_config["android"]["maxSDK"] unless $app_config["android"].nil?
@@ -531,6 +579,18 @@ namespace "config" do
       #If user has mentioned version under android, then select that particular api level.
       if $app_config["android"]["version"]
         apilevel = AndroidTools.get_api_level $app_config["android"]["version"]
+        version = $app_config["android"]["version"]
+        $major_version = 0
+        $minor_version = 0
+        get_android_major_minor(version)
+
+        market_version = AndroidTools.get_market_version($target_sdk_level)
+        if market_version.nil?
+          apilevel = android_api_levels.last
+        else
+          apilevel = $target_sdk_level
+        end
+
         if(!apilevel)
           apilevel = AndroidTools.get_api_level ($app_config["android"]["version"] + ".0")
         end
@@ -598,6 +658,7 @@ namespace "config" do
 
     $rhores = File.join $androidpath, 'Rhodes','res'
     $appres = File.join $tmpdir,'res'
+    $appres_flats = File.join $tmpdir,'flats'
     $appassets = $srcdir
     $applibs = File.join $tmpdir,'lib'
 
@@ -677,11 +738,13 @@ namespace "config" do
         end
       end
 
+      $aapt2 = nil
       if build_tools_path
         puts "Using Android SDK build-tools: #{build_tools_path}"
         build_tools_path = File.join $androidsdkpath,'build-tools',build_tools_path
         $dxjar = File.join(build_tools_path,'lib','dx.jar')
         $aapt = File.join(build_tools_path, "aapt#{$exe_ext}")
+        $aapt2 = File.join(build_tools_path, "aapt2#{$exe_ext}")
       else
         $dxjar = File.join($androidsdkpath, "platforms", $androidplatform, "tools", "lib", "dx.jar")
         $dxjar = File.join($androidsdkpath, "platform-tools", "lib", "dx.jar") unless File.exists? $dxjar
@@ -1173,6 +1236,53 @@ end
 namespace "build" do
   namespace "android" do
 
+    task :rhodeslib_bundle, [:target_path]  => ["config:set_android_platform", "config:common"] do |t, args|
+      print_timestamp('build:android:rhodeslib_bundle START')
+        target_path = args[:target_path]
+
+        $skip_build_rhodes_main = true
+        $skip_build_extensions = true
+        $skip_build_xmls = true
+        $use_prebuild_data = true
+
+        Rake::Task['config:android'].invoke
+
+        appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+        appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+
+        Rake::Task['build:android:rhobundle'].invoke
+
+        mkdir_p target_path if not File.exists? target_path
+
+        source_RhoBundle = $appassets
+
+        rm_rf File.join(target_path, "apps") if File.exists? File.join(target_path, "apps")
+        rm_rf File.join(target_path, "db") if File.exists? File.join(target_path, "db")
+        rm_rf File.join(target_path, "lib") if File.exists? File.join(target_path, "lib")
+        rm_rf File.join(target_path, "hash") if File.exists? File.join(target_path, "hash")
+        rm_rf File.join(target_path, "name") if File.exists? File.join(target_path, "name")
+        rm_rf File.join(target_path, "rho.dat") if File.exists? File.join(target_path, "rho.dat")
+
+        cp_r File.join(source_RhoBundle, "apps"), target_path
+        cp_r File.join(source_RhoBundle, "db"), target_path
+        cp_r File.join(source_RhoBundle, "lib"), target_path
+        cp_r File.join(source_RhoBundle, "hash"), target_path
+        cp_r File.join(source_RhoBundle, "name"), target_path
+        cp_r File.join(source_RhoBundle, "rho.dat"), target_path
+
+      print_timestamp('build:android:rhodeslib_bundle FINISH')
+    end
+
+    task :rhodeslib_lib, [:target_path] => [:rhobundle] do |t, args|
+      print_timestamp('build:android:rhodeslib_lib START')
+      $rhodes_as_lib = true
+      Rake::Task["package:android"].invoke
+      target_path = args[:target_path]
+      cp_r File.join($bindir, "#{$appname}-#{$app_config["version"]}.aar"), target_path
+      print_timestamp('build:android:rhodeslib_lib FINISH')
+    end
+
+
     desc "Build RhoBundle for android"
     task :rhobundle => ["config:android"] do
       print_timestamp('build:android:rhobundle START')
@@ -1219,7 +1329,7 @@ namespace "build" do
       ENV["RHO_APP_DIR"] = $app_path
       ENV["ANDROID_SDK"] = $androidsdkpath
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
       ENV["RHO_INC"] = $appincdir
@@ -1276,6 +1386,8 @@ namespace "build" do
               args << '--trace' if USE_TRACES
             end
 
+            #puts "builddata: " + builddata[1] + " args: " + args.to_s + " builddata0: " + builddata[0].to_s
+            #puts ENV.to_s
             cc_run(builddata[1], args, builddata[0], false, nil, USE_TRACES) or raise "Extension build failed: #{builddata[0]}"
           else
             currentdir = Dir.pwd()
@@ -1364,7 +1476,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'libsqlite_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname["sqlite"])
@@ -1408,7 +1520,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'libcurl_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname["curl"])
@@ -1446,11 +1558,12 @@ namespace "build" do
       args << "-I\"#{srcdir}\""
       args << "-I\"#{srcdir}/..\""
       args << "-I\"#{srcdir}/../sqlite\""
+      #args << "-I\"#{$startdir}/platform/android/Rhodes/jni/include\""
 
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'libruby_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname["ruby"])
@@ -1484,7 +1597,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'libjson_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname["json"])
@@ -1517,7 +1630,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librholog_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname['rholog'])
@@ -1551,7 +1664,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librhomain_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname['rhomain'])
@@ -1586,7 +1699,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librhocommon_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname['rhocommon'])
@@ -1623,7 +1736,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librhodb_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname['rhodb'])
@@ -1658,7 +1771,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librhosync_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.dirname($libname['rhosync'])
@@ -1769,7 +1882,7 @@ namespace "build" do
       ENV['SOURCEPATH'] = File.join($androidpath,'..','..')
       ENV['SOURCELIST'] = File.join($builddir, 'librhodes_build.files')
       ENV["ANDROID_NDK"] = $androidndkpath
-      ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
+      ENV["ANDROID_API_LEVEL"] = $min_sdk_level.to_s
       ENV["RHO_ROOT"] = $startdir
       ENV["RHO_INC"] = $appincdir
       ENV["TARGETPATH"] = File.join $app_builddir, 'librhodes', 'lib'
@@ -1885,7 +1998,7 @@ namespace "build" do
 
       version = version["major"]*1000000 + version["minor"]*10000 + version["patch"]*100 + version["build"]
 
-      usesPermissions = ['android.permission.INTERNET', 'android.permission.PERSISTENT_ACTIVITY', 'android.permission.WAKE_LOCK']
+      usesPermissions = ['android.permission.RECEIVE_BOOT_COMPLETED', 'android.permission.INTERNET', 'android.permission.PERSISTENT_ACTIVITY', 'android.permission.WAKE_LOCK']
       $app_config["capabilities"].each do |cap|
         cap = ANDROID_PERMISSIONS[cap]
         next if cap.nil?
@@ -1920,6 +2033,10 @@ namespace "build" do
       generator.hardwareAcceleration = true if $app_config["capabilities"].index('hardware_acceleration')
       generator.apikey = $gapikey if $gapikey
       generator.debuggable = $debug
+      generator.buildSdkVer = $found_api_level
+      generator.buildToolsVer = $build_tools_ver
+      generator.androidVerMaj = $major_version
+      generator.androidVerMin = $minor_version
 
       generator.addUriParams $uri_scheme, $uri_host, $uri_path_prefix
 
@@ -2034,6 +2151,8 @@ namespace "build" do
         end
       end
 
+      set_app_name_android_post($appname)
+
       #copy icon after extension resources in case it overwrites them (like rhoelementsext...)
       set_app_icon_android
 
@@ -2047,11 +2166,21 @@ namespace "build" do
       mkdir_p File.join($applibs,'armeabi')
       mkdir_p File.join($applibs,'armeabi-v7a')
       mkdir_p File.join($applibs,'x86')
+      mkdir_p File.join($applibs,'arm64-v8a')
+
       # Add .so libraries
       Dir.glob($app_builddir + "/**/lib*.so").each do |lib|
         arch = File.basename(File.dirname(lib))
         file = File.basename(lib)
+        arch = 'arm64-v8a' if arch == "aarch64"
         cp_r lib, File.join($applibs,arch,file)
+        
+        localabi = arch
+        localabi = "armeabi-v7a" if arch == "armeabi"
+        llvm_stl = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", localabi, "libc++_shared.so")
+        if File.exists? llvm_stl
+          cp_r llvm_stl, File.join($applibs,arch)
+        end
       end
       $ext_android_additional_lib.each do |lib|
         arch = File.basename(File.dirname(lib))
@@ -2169,12 +2298,57 @@ namespace "build" do
 
       puts "Generate initial R.java at #{$app_rjava_dir}"
 
-      args = ["package", "-f", "-M", $appmanifest, "-S", $appres, "-A", $appassets, "-I", $androidjar, "-J", $app_rjava_dir]
-      args += AndroidTools::MavenDepsExtractor.instance.aapt_args
+     if ($rhodes_as_lib)
+        puts $appres.to_s
+        puts $app_rjava_dir.to_s
+
+        mkdir_p $appres_flats
+
+        Dir.glob(File.join($appres,'**','*.*')) do |filepath|
+          args = ["compile", PathToWindowsWay(filepath), "-o", PathToWindowsWay($appres_flats)]
+          args << '-v' if USE_TRACES
+          Jake.run($aapt2, args)
+        end
+
+        flat_args = []
+        Dir.glob(File.join($appres_flats,'**','*.flat')) do |filepath|
+          flat_args << PathToWindowsWay(filepath)
+        end
+
+        FormatManifestToAapt2Compat($appmanifest)
+        
+        args = 
+        [
+          "link", 
+          "-o", PathToWindowsWay(File.join($bindir, "_tmp.aar")), 
+          "-I", PathToWindowsWay($androidjar)
+        ]
+        args += flat_args
+        args +=
+        [
+          "--manifest", PathToWindowsWay($appmanifest), 
+          "-A", PathToWindowsWay($appassets), 
+          "--java", PathToWindowsWay($app_rjava_dir), 
+          "--output-text-symbols", PathToWindowsWay(File.join($app_rjava_dir, 'R.txt'))
+        ]
+        #args += AndroidTools::MavenDepsExtractor.instance.aapt_args
+      else
+
+        args = ["package", "-f", "-M", $appmanifest, "-S", $appres, "-A", $appassets, "-I", $androidjar, "-J", $app_rjava_dir]
+        args += AndroidTools::MavenDepsExtractor.instance.aapt_args
+      end
 
       args << '-v' if USE_TRACES
 
-      Jake.run($aapt, args)
+      if ($rhodes_as_lib)
+        require 'nokogiri'
+        FormatManifestToAarCompat($appmanifest)
+        Jake.run($aapt2, args)
+        cp_r File.join($app_rjava_dir, 'com', $vendor, $appname, 'R.java'), File.join($app_rjava_dir, 'R.java')
+        rm_rf File.join($app_rjava_dir, 'com', $vendor, $appname, 'R.java')
+      else
+        Jake.run($aapt, args)
+      end
 
       raise 'Error in AAPT: R.java' unless $?.success?
 
@@ -2489,9 +2663,139 @@ namespace "build" do
   end
 end
 
+def FormatManifestToAarCompat(path)
+  doc = File.open(path) { |f| Nokogiri::XML(f) }
+  root = doc.xpath("//manifest/*")
+  application = root.xpath("//application/*")
+
+  doc2 = doc.xpath("//manifest")
+  doc2[0].remove_attribute("versionCode")
+  doc2[0].remove_attribute("installLocation")
+  doc2[0]["xmlns:tools"] = "http://schemas.android.com/tools"
+
+  root.each do |node|
+    node["tools:node"] = "merge" if node.name.to_s == 'uses-permission'
+    node["tools:node"] = "merge" if node.name.to_s == 'uses-feature'
+    if node.name.to_s == 'application'
+      node["tools:node"] = "merge"
+      node.remove_attribute("name")
+      node.remove_attribute("label")
+      node.remove_attribute("icon")
+    end
+  end
+
+  application.each do |node|
+    node["tools:node"] = "merge"
+    if node["android:name"] == 'com.rhomobile.rhodes.RhodesActivity'
+      intent_filters = node.xpath(".//*/*")
+      intent_filters.each do |child|
+        if child["android:name"] == 'android.intent.action.MAIN'
+          child.parent.remove
+        end
+      end
+    end
+  end
+
+  new_doc = Nokogiri::XML::Document.parse(doc.to_s, nil, "UTF-8")
+  File.open(path, "w") {|file| file << new_doc.to_xml }
+end
+
+
+def prepare_aar_package
+  alljars = Dir.glob(File.join($app_builddir, '**', '*.jar'))
+  #alljars += AndroidTools::MavenDepsExtractor.instance.jars
+
+  require 'set'
+  unique_jars = Set.new
+
+  args = ['cvf', 'classes.jar', '-C', '.', '.']
+  jarNamesCounter = 0
+  
+  $allclasses = File.join($tmpdir, 'allclasses')
+  mkdir_p $allclasses
+
+  puts "Creating classes.jar for aar package"
+  
+  if File.exist?(File.join($allclasses, 'classes.jar'))
+    rm_rf File.join($allclasses, 'classes.jar')
+  end
+
+  alljars.each do |jar|
+    Zip::File.open(jar) do |archive|
+      archive.glob("**/*.*").each do |pfile|
+        next if !(pfile.name =~ /.*\.class$/)
+        target = File.join($allclasses, pfile.name)
+        mkdir_p File.dirname(target)
+        rm target if File.file?(target)
+        archive.extract( pfile, File.join(target) )
+      end
+    end
+  end
+
+  rm_rf File.join($allclasses, 'com', $vendor , $appname)
+
+  Jake.run($jarbin, args, $allclasses)
+
+  unless $?.success?
+    raise "Error while creating classes.jar"
+  end
+
+  resourcepkg = File.join($bindir, "#{$appname}-#{$app_config["version"]}.aar")
+
+  args = ["cvf", resourcepkg, 'classes.jar']
+  Jake.run($jarbin, args, $allclasses)
+  unless $?.success?
+    raise "Error packaging classes.jar file"
+  end
+
+  #args = ["uf", resourcepkg, '-C', '.', 'assets']
+  #Jake.run($jarbin, args, $tmpdir)
+  #unless $?.success?
+  #  raise "Error packaging classes.jar file"
+  #end
+
+  mkdir_p File.join($tmpdir, 'jni')
+
+  Dir.glob(File.join($tmpdir, 'lib', '*')).each do |lib|
+    cp_r lib, File.join($tmpdir, 'jni')
+  end
+
+  args = ["uf", resourcepkg]
+  Dir.glob(File.join(File.join($tmpdir, 'jni'),'**','lib*.so')).each do |jni|
+    arch = File.basename(File.dirname(jni))
+    args << "jni/#{arch}/#{File.basename(jni)}"
+  end
+  Jake.run($jarbin, args, $tmpdir)
+  unless $?.success?
+    raise "Error packaging native libraries"
+  end
+
+  args = ["uf", resourcepkg, 'R.txt']
+  Jake.run($jarbin, args, $app_rjava_dir)
+  unless $?.success?
+    raise "Error packaging R.txt file"
+  end
+
+  args = ["uf", resourcepkg, '-C', '.', 'res']
+  Jake.run($jarbin, args, $tmpdir)
+
+  FormatManifestToAarCompat($appmanifest)
+  args = ["uf", resourcepkg, 'AndroidManifest.xml']
+  Jake.run($jarbin, args, File.dirname($appmanifest))
+
+  #$appmanifest
+
+end
+
 namespace "package" do
   task :android => "build:android:all" do
     print_timestamp('package:android START')
+
+    if $rhodes_as_lib
+      prepare_aar_package()
+      next
+    end
+    
     puts "Running dx utility"
     args = []
     args << "-Xmx1024m"