rhodes 3.3.5 → 3.4.2

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality11.java

@@ -0,0 +1,47 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
+package com.rhomobile.rhodes.osfunctionality;
+
+import com.rhomobile.rhodes.Logger;
+
+import android.webkit.WebView;
+
+
+//Android 3.0.x
+class AndroidFunctionality11 extends AndroidFunctionality10 implements AndroidFunctionality {
+
+    @Override
+    public void pauseWebView( WebView view, boolean doPause ) {
+	if ( doPause ) {	    
+	    view.onPause();
+	    Logger.I(TAG, "Pause WebView");
+	} else {	    
+	    view.onResume();
+	    Logger.I(TAG, "Resume WebView");
+	}
+    }  
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

@@ -40,7 +40,10 @@ public class AndroidFunctionalityManager {
 	public static AndroidFunctionality getAndroidFunctionality() {
 		if (ourFunctionality == null) {
 			int sdkVersion = Build.VERSION.SDK_INT;
-			if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD_MR1) { // 2.3.3 and above - 10
+			if (sdkVersion >= Build.VERSION_CODES.HONEYCOMB) { // 3.0.x - 11
+				ourFunctionality = new AndroidFunctionality11();
+			}
+			else if (sdkVersion == Build.VERSION_CODES.GINGERBREAD_MR1) { // 2.3.3 and above - 10
 				ourFunctionality = new AndroidFunctionality10();
 			}
 			else if (sdkVersion == Build.VERSION_CODES.GINGERBREAD) { // 2.3, 2.3.1, 2.3.2 - 9

data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java

@@ -37,6 +37,7 @@ import java.net.SocketImpl;
 import java.net.SocketOptions;
 
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhoConf;
 
 public class RhoSocketImpl extends SocketImpl {
 	
@@ -44,7 +45,9 @@ public class RhoSocketImpl extends SocketImpl {
 	
 	private int sockfd = -1;
 	
-	private int soTimeout = 0;
+	private static final int DEFAULT_TIMEOUT = 30000;
+	
+	private int soTimeout = DEFAULT_TIMEOUT;
 	private int ipTos = 0;
 	
 	private RhoSockAddr remote;
@@ -57,6 +60,11 @@ public class RhoSocketImpl extends SocketImpl {
 	public RhoSocketImpl(int s, RhoSockAddr rem) {
 		Logger.D(TAG, "New socket wrapper. fd: " + s + ", host: " + rem.host + ", port: " + rem.port);
 		
+		soTimeout = RhoConf.getInt("net_timeout");
+		if ( 0 == soTimeout ) {
+			soTimeout = DEFAULT_TIMEOUT;
+		}
+		
 		sockfd = s;
 		remote = rem;
 		initImpl(sockfd);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java

@@ -173,4 +173,14 @@ public class GoogleWebView implements IRhoWebView {
     public String getEngineId() {
         return "WEBKIT/GOOGLE/" + Build.VERSION.RELEASE;
     }
+
+    @Override
+    public void onPause() {
+	AndroidFunctionalityManager.getAndroidFunctionality().pauseWebView(mWebView,true);
+    }
+
+    @Override
+    public void onResume() {
+	AndroidFunctionalityManager.getAndroidFunctionality().pauseWebView(mWebView,false);
+    }
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/IRhoWebView.java

@@ -23,4 +23,6 @@ public interface IRhoWebView {
     void setZoom(int scale);
     void setTextZoom(int scale);
     String getEngineId();
+    void onPause();
+    void onResume();
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java

@@ -30,6 +30,7 @@ import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhoConf;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.extmanager.IRhoExtension;
 import com.rhomobile.rhodes.extmanager.RhoExtManager;
 
 import android.graphics.Bitmap;
@@ -53,6 +54,8 @@ public class RhoWebViewClient extends WebViewClient
     public void onPageStarted(WebView view, String url, Bitmap favicon) {
         super.onPageStarted(view, url, favicon);
         
+        Logger.profStart("BROWSER_PAGE");
+        
         if (!RhoConf.getBool("disable_loading_indication"))
             RhodesActivity.safeGetInstance().getWindow().setFeatureInt(Window.FEATURE_PROGRESS, 0);
         else
@@ -63,6 +66,9 @@ public class RhoWebViewClient extends WebViewClient
     
     @Override
     public void onPageFinished(WebView view, String url) {
+        
+        Logger.profStop("BROWSER_PAGE");
+        
         // Set title
         String title = view.getTitle();
         RhodesActivity.safeGetInstance().setTitle(title);
@@ -75,17 +81,18 @@ public class RhoWebViewClient extends WebViewClient
     }
     
     @Override
-    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl)
-    {
+    public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
         super.onReceivedError(view, errorCode, description, failingUrl);
         
-        RhoExtManager.getImplementationInstance().onLoadError(view);
+        Logger.profStop("BROWSER_PAGE");
         
         StringBuilder msg = new StringBuilder(failingUrl);
         msg.append(" failed: ");
         msg.append(errorCode);
         msg.append(" - " + description);
         Logger.E(TAG, msg.toString());
+
+        RhoExtManager.getImplementationInstance().onLoadError(view, IRhoExtension.LoadErrorReason.INTERNAL_ERROR);
     }
 
     @Override

data/platform/android/build/RhodesSRC_build.files

@@ -105,7 +105,6 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/IRhoListener.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtDataImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManagerImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/RhoExtManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/extmanager/WebkitExtension.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality02.java
@@ -117,4 +116,5 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunction
 platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java
 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/AndroidFunctionalityManager.java

data/platform/android/build/android.rake

@@ -26,6 +26,7 @@
 
 require File.dirname(__FILE__) + '/androidcommon.rb'
 require File.dirname(__FILE__) + '/android_tools.rb'
+require File.dirname(__FILE__) + '/manifest_generator.rb'
 require 'pathname'
 require 'tempfile'
 
@@ -115,10 +116,17 @@ def add_push(manifest)
 end
 
 def add_motosol_sdk(manifest)
-  uses_library = REXML::Element.new 'uses-library'
-  uses_library.add_attribute 'android:name', 'com.motorolasolutions.scanner'
+  uses_scanner = REXML::Element.new 'uses-library'
+  uses_scanner.add_attribute 'android:name', 'com.motorolasolutions.scanner'
+  uses_scanner.add_attribute 'android:required', 'false'
+
+  uses_msr = REXML::Element.new 'uses-library'
+  uses_msr.add_attribute 'android:name', 'com.motorolasolutions.emdk.msr'
+  uses_msr.add_attribute 'android:required', 'false'
+
   manifest.elements.each('application') do |app|
-    app.add uses_library
+    app.add uses_scanner
+    app.add uses_msr
   end  
 end
 
@@ -140,195 +148,24 @@ def set_app_name_android(newname)
   doc.elements["resources/string[@name='app_name']"].text = newname
   File.open(appstrings, "w") { |f| doc.write f }
 
-  version = {'major' => 0, 'minor' => 0, 'patch' => 0}
-  if $app_config["version"]
-    if $app_config["version"] =~ /^(\d+)$/
-      version["major"] = $1.to_i
-    elsif $app_config["version"] =~ /^(\d+)\.(\d+)$/
-      version["major"] = $1.to_i
-      version["minor"] = $2.to_i
-    elsif $app_config["version"] =~ /^(\d+)\.(\d+)\.(\d+)$/
-      version["major"] = $1.to_i
-      version["minor"] = $2.to_i
-      version["patch"] = $3.to_i
-    end
-  end
-  
-  version = version["major"]*10000 + version["minor"]*100 + version["patch"]
-
-  doc = REXML::Document.new(File.new($rhomanifest))
-  doc.root.attributes['package'] = $app_package_name
-  if version > 0
-    doc.root.attributes['android:versionCode'] = version.to_s
-    doc.root.attributes['android:versionName'] = $app_config["version"]
-  end
-
-  doc.elements.delete "manifest/application/uses-library[@android:name='com.google.android.maps']" unless $use_geomapping
-
-  caps_proc = []
-  # Default permissions. Need to be always enabled.
-  caps = ['INTERNET', 'PERSISTENT_ACTIVITY', 'WAKE_LOCK']
-  $app_config["capabilities"].each do |cap|
-    cap = ANDROID_PERMISSIONS[cap]
-    next if cap.nil?
-    cap = [cap] unless cap.is_a? Array
-
-    cap.each do |cap_item|
-      if cap_item.is_a? Proc
-        caps_proc << cap_item
-        next
-      end
-      if cap_item.is_a? String
-        caps << cap_item
-        next
-      end
-    end
-  end
-  caps.uniq!
-
-  manifest = doc.elements["manifest"]
-
-  manifest.elements.each('uses-sdk') { |e| manifest.delete e }
   
-  element = REXML::Element.new('uses-sdk')
-  element.add_attribute('android:minSdkVersion', $min_sdk_level.to_s)
-  element.add_attribute('android:maxSdkVersion', $max_sdk_level.to_s) unless $max_sdk_level.nil?  
-  manifest.add element
-
-  # Remove category LAUNCHER from all activities if hidden_app is set
-  hidden_app = get_boolean($app_config['hidden_app'])
-  if hidden_app
-    manifest.elements.each('application') do |app|
-      app.elements.each('activity') do |activity|
-        activity.elements.each('intent-filter') do |intf|
-          intf.elements.each('category') do |c|
-            name = c.attribute('name', 'android')
-            next if name.nil?
-            intf.delete(c) if name.to_s == 'android.intent.category.LAUNCHER'
-          end
-        end
-      end
-    end
-  end
-
-  # Clear C2DM stuff
-  doc.elements.delete "manifest/application/receiver[@android:name='#{JAVA_PACKAGE_NAME}.PushReceiver']"
-  manifest.elements.each('permission') do |e|
-    name = e.attribute('name', 'android')
-    next if name.nil?
-    manifest.delete(e) if name.to_s =~ /\.C2D_MESSAGE$/
-  end
-
-  app = doc.elements["manifest/application"]
-
-  app.elements.each("activity") do |a|
-    a.elements.each("intent-filter") do |filter|
-      filter.elements.each("action") do |act|
-        act_name = act.attribute("name", "android")
-        next if act_name.nil?
-        if act_name.to_s =~ /\.VIEW$/
-          default_filter = false
-          browsable_filter = false
-          filter.elements.each("category") do |c|
-            cat_name = c.attribute("name", "android")
-            next if cat_name.nil?
-            default_filter = true if cat_name.to_s =~ /\.DEFAULT$/
-            browsable_filter = true if cat_name.to_s =~ /\.BROWSABLE$/
-          end
-          if default_filter and browsable_filter
-            filter.elements.each("data") do |d|
-              filter.delete d
-            end
-            uri_params = {"android:scheme" => $uri_scheme, "android:host" => $uri_host}
-            uri_params["android:pathPrefix"] = $uri_path_prefix unless $uri_path_prefix.nil?
-            filter.add_element "data", uri_params
-          end
-        end
-      end
-    end
-  end
-
-  provider = app.add_element(
-    "provider",
-    { "android:name" => "#{JAVA_PACKAGE_NAME}.LocalFileProvider",
-      "android:authorities" => $app_package_name,
-      "android:grantUriPermissions" => "false" } )
-
-  provider.add_element "grant-uri-permission", { "android:pathPrefix" => "/rhodes/apps/" }
-
-  manifest.elements.each('uses-permission') { |e| manifest.delete e }
-
-
-  uses_camera = false
-  uses_autofocus = false
-  uses_front = false
-  uses_flash = false
-
-  manifest.elements.each('uses-feature') do |e|
-    uname = e.attribute("name", "android").to_s 
-    if "android.hardware.camera".eql? uname
-       uses_camera = true
-    end
-    if "android.hardware.camera.autofocus".eql? uname
-       uses_autofocus = true
-    end
-    if "android.hardware.camera.front".eql? uname
-       uses_front = true
-    end
-    if "android.hardware.camera.flash".eql? uname
-       uses_flash = true
-    end
-  end
-
-  caps.sort.each do |cap|
-    element = REXML::Element.new('uses-permission')
-    element.add_attribute('android:name', "android.permission.#{cap}")
-    manifest.add element
-    if cap == 'CAMERA'
-        if !uses_camera
-           element = REXML::Element.new('uses-feature')
-           element.add_attribute('android:required', "false")
-           element.add_attribute('android:name', "android.hardware.camera")
-           manifest.add element
-        end
-        if !uses_autofocus
-           element = REXML::Element.new('uses-feature')
-           element.add_attribute('android:required', "false")
-           element.add_attribute('android:name', "android.hardware.camera.autofocus")
-           manifest.add element
-        end
-        if !uses_front
-           element = REXML::Element.new('uses-feature')
-           element.add_attribute('android:required', "false")
-           element.add_attribute('android:name', "android.hardware.camera.front")
-           manifest.add element
-        end
-        if !uses_flash
-           element = REXML::Element.new('uses-feature')
-           element.add_attribute('android:required', "false")
-           element.add_attribute('android:name', "android.hardware.camera.flash")
-           manifest.add element
-        end
-    end
-  end
-
-  caps_proc.each do |p|
-    p.call manifest
-  end
-
-  puts 'save updated application manifest'
-  app_f = File.open($appmanifest, "w")
-  doc.write app_f, 2
-  app_f.close
-
-  #File.open($appmanifest, "w") { |f| doc.write f, 2 }
-
   buf = File.new($rho_android_r,"r").read.gsub(/^\s*import com\.rhomobile\..*\.R;\s*$/,"\nimport #{$app_package_name}.R;\n")
   File.open($app_android_r,"w") { |f| f.write(buf) }
 end
 
 def generate_rjava
-  Rake::Task["build:android:rjava"].execute
+      manifest = $appmanifest
+      resource = $appres
+      assets = Jake.get_absolute File.join($tmpdir, 'assets')
+      nativelibs = Jake.get_absolute(File.join($androidpath, "Rhodes", "libs"))
+      #rjava = Jake.get_absolute(File.join($androidpath, "Rhodes", "gen", "com", "rhomobile", "rhodes"))
+
+      args = ["package", "-f", "-M", manifest, "-S", resource, "-A", assets, "-I", $androidjar, "-J", $app_rjava_dir]
+      Jake.run($aapt, args)
+
+      unless $?.success?
+        raise "Error in AAPT"
+      end
 end
 
 def get_boolean(arg)
@@ -341,7 +178,6 @@ namespace "config" do
   end
 
   task :android => :set_android_platform do
-
     Rake::Task["config:common"].invoke
 
     $java = $config["env"]["paths"]["java"]
@@ -411,9 +247,6 @@ namespace "config" do
 
     $uri_host = $app_config["android"]["URIHost"] unless $app_config["android"].nil?
 
-    $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
-    $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
-
     # Here is switch between release/debug configuration used for
     # building native libraries
     if $app_config["debug"].nil?
@@ -428,12 +261,12 @@ namespace "config" do
     $builddir = File.join($androidpath, "build")
     $shareddir = File.join($androidpath, "..", "shared")
     $srcdir = File.join($bindir, "RhoBundle")
-    $targetdir = File.join($bindir, "target/android")
+    $targetdir = File.join($bindir,'target','android')
     $excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
     $tmpdir = File.join($bindir, "tmp")
-    $libs = File.join($androidpath, "Rhodes", "libs")
 
-    $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
+    #$rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
+    $rhomanifesterb = File.join $androidpath, "Rhodes", "AndroidManifest.xml.erb"
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
 
     $rhores = File.join $androidpath, "Rhodes", "res"
@@ -450,8 +283,6 @@ namespace "config" do
     $app_startup_listeners_java = File.join $tmpdir, "RhodesStartupListeners.java"
 
     if RUBY_PLATFORM =~ /(win|w)32$/
-      $emulator = #"cmd /c " + 
-        File.join( $androidsdkpath, "tools", "emulator.exe" )
       $bat_ext = ".bat"
       $exe_ext = ".exe"
       $path_separator = ";"
@@ -464,7 +295,6 @@ namespace "config" do
       end
     else
       #XXX make these absolute
-      $emulator = File.join( $androidsdkpath, "tools", "emulator" )
       $bat_ext = ""
       $exe_ext = ""
       $path_separator = ":"
@@ -472,47 +302,6 @@ namespace "config" do
     end
 
     puts "+++ Looking for platform..." if USE_TRACES
-#    napilevel = $min_sdk_level
-    
-    $emuversion = AndroidTools.get_market_version($min_sdk_level) if $emuversion.nil?
-    if $emuversion.nil?
-      android_api_levels.each do |v|
-        puts "Check api level for emulator '#{v}'"
-        if v >= $min_sdk_level
-          $emuversion = AndroidTools.get_market_version(v)
-          puts "emulator version will used: '#{$emuversion}'"
-          break
-        end
-      end
-    end
-    requested_api_level = AndroidTools.get_api_level($emuversion)
-
-    if USE_TRACES
-      puts "Found API levels:"
-      android_api_levels.each do |level|
-        puts level
-      end
-      puts "Requested version: #{$emuversion}"
-      puts "Corresponding API level #{requested_api_level}"
-    end
-
-    if requested_api_level.nil?
-      puts "ERROR!!! Wrong Android API version: #{$emuversion}"
-      exit 1
-    end
-
-    is_api_level_installed = false
-    android_api_levels.each do |level|
-      if level == requested_api_level
-        is_api_level_installed = true
-        break
-      end
-    end
-
-    if !is_api_level_installed
-      puts "ERROR!!! API version is not found in installed Android SDK: #{$emuversion}"
-      exit 1
-    end
 
     if $androidplatform.nil?
       ajar = File.join($androidsdkpath, 'platforms', 'android-' + $min_sdk_level.to_s, 'android.jar')
@@ -585,8 +374,8 @@ namespace "config" do
     $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '') unless $app_package_name
     $app_package_name.gsub!(/\.[\d]/, "._")
     
-    puts "$vendor = #{$vendor} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
-    puts "$app_package_name = #{$app_package_name} >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
+    puts "$vendor = #{$vendor}"
+    puts "$app_package_name = #{$app_package_name}"
 
     if $uri_host.nil?
       if $app_config['capabilities'].index('motorola').nil? and $app_config['capabilities'].index('motoroladev').nil?
@@ -598,7 +387,7 @@ namespace "config" do
     end
 
     unless $app_config['capabilities'].index('motorola').nil? and $app_config['capabilities'].index('motoroladev').nil?
-      $use_motosol_barcode_api = true
+      $use_motosol_api = true
       $use_motosol_api_classpath = true unless $app_config['capabilities'].index('motoroladev').nil?
       raise 'Cannot use Motorola SDK addon and Google SDK addon together!' if $use_google_addon_api
     end
@@ -610,99 +399,25 @@ namespace "config" do
       $applog_path = File.join( $app_path, $applog_file )
     end 
 
-    # Look for Motorola barcode SDK addon
-    if $use_motosol_api_classpath
-      Dir.glob(File.join($androidsdkpath, 'add-ons', '*')).each do |dir|
-        apijar = File.join(dir, 'libs', 'com.motorolasolutions.scanner.jar')
-        if File.exists? apijar
-          $motosol_jar = apijar
-        end
-      end
-      if $motosol_jar.nil?
-        raise "No Motorola Solutions SDK addon is found!!!"
-      end
+    if $min_sdk_level > $found_api_level
+      raise "Latest installed Android platform '#{$androidplatform}' does not meet minSdk '#{$min_sdk_level}' requirement"
     end
 
-    # Detect android targets
-    if $androidtargets.nil?
-      $androidtargets = {}
-      id = nil
-
-      `"#{$androidbin}" list targets`.split(/\n/).each do |line|
-        line.chomp!
-
-        if line =~ /^id:\s+([0-9]+)/
-          id = $1
-        end
-
-        if $use_google_addon_api
-          if line =~ /:Google APIs:([0-9]+)/
-            apilevel = $1
-            $androidtargets[apilevel.to_i] = id.to_i
-          end
-        else
-          if line =~ /^\s+API\s+level:\s+([0-9]+)$/ and not id.nil?
-            apilevel = $1
-            $androidtargets[apilevel.to_i] = id.to_i
-          end
-        end
-      end
+    # Look for Motorola SDK addon
+    if $use_motosol_api_classpath
+      puts "Looking for Motorola API SDK add-on..." if USE_TRACES
+      motosol_jars = ['com.motorolasolutions.scanner']
+      motosol_jars << 'com.motorolasolutions.emdk.msr'
+      $motosol_classpath = AndroidTools::get_addon_classpath(motosol_jars)
     end
 
     # Detect Google API add-on path
     if $use_google_addon_api
-      puts "+++ Looking for Google APIs add-on..." if USE_TRACES
-      puts "Previously found API level: #{$found_api_level}" if USE_TRACES
-      napilevel = $min_sdk_level
-      Dir.glob(File.join($androidsdkpath, 'add-ons', '*')).each do |dir|
-
-        props = File.join(dir, 'manifest.ini')
-        if !File.file? props
-          puts "+++ WARNING: no manifest.ini found in #{dir}"
-          next
-        end
-
-        apilevel = -1
-        File.open(props, 'r') do |f|
-          while line = f.gets
-            next unless line =~ /^api=([0-9]+)$/
-            apilevel = $1.to_i
-            break
-          end
-        end
-
-        puts "+++ API LEVEL of #{dir}: #{apilevel}" if USE_TRACES
-
-        if apilevel >= napilevel
-          
-          sgapijar = File.join(dir, 'libs', 'maps.jar')
-          if File.exists? sgapijar
-            napilevel = apilevel
-            $gapijar = sgapijar
-            $found_api_level = apilevel
-          end
-        end
-      end
-      if $gapijar.nil?
-        raise "+++ No Google APIs add-on found (which is required because appropriate capabilities enabled in build.yml)"
-      else
-        puts "+++ Google APIs add-on found: #{$gapijar}" if USE_TRACES
-      end
-    end
-
-    if $min_sdk_level > $found_api_level
-        puts "Latest installed Android platform '#{$androidplatform}' does not meet minSdk '#{$min_sdk_level}' requirement"
-        exit 1
+      puts "Looking for Google API SDK add-on..." if USE_TRACES
+      google_jars = ['com.google.android.maps']
+      $google_classpath = AndroidTools::get_addon_classpath(google_jars, $found_api_level)
     end
 
-    $emuversion = $emuversion.to_s
-    $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
-    $avdname += "ext" if $use_google_addon_api
-    $avdtarget = $androidtargets[get_api_level($emuversion)]
-
-    $appavdname = $app_config["android"]["emulator"] if $app_config["android"] != nil && $app_config["android"].length > 0
-    $appavdname = $config["android"]["emulator"] if $appavdname.nil? and !$config["android"].nil? and $config["android"].length > 0
-
     setup_ndk($androidndkpath, $found_api_level)
     
     $std_includes = File.join $androidndkpath, "sources", "cxx-stl", "stlport", "stlport"
@@ -718,15 +433,16 @@ namespace "config" do
     else
       $confdir = "debug"
     end
+
+    $app_builddir = File.join($bindir,'target','android',$confdir)
+
     $objdir = {}
     $libname = {}
     $native_libs.each do |x|
-      $objdir[x] = File.join($rhobindir, $confdir, $ndkabi, $ndkgccver, "lib" + x)
-      $libname[x] = File.join($rhobindir, $confdir, $ndkabi, $ndkgccver, "lib" + x + ".a")
+      $objdir[x] = File.join($tmpdir,x)
+      $libname[x] = File.join($app_builddir,x,"lib#{x}.a")
     end
 
-    $extensionsdir = $bindir + "/libs/" + $confdir + "/" + $ndkabi + "/" + $ndkgccver + "/extensions"
-
     $push_sender = nil
     $push_sender = $config["android"]["push"]["sender"] if !$config["android"].nil? and !$config["android"]["push"].nil?
     $push_sender = $app_config["android"]["push"]["sender"] if !$app_config["android"].nil? and !$app_config["android"]["push"].nil?
@@ -741,19 +457,18 @@ namespace "config" do
     mkdir_p $rhobindir if not File.exists? $rhobindir
     mkdir_p $targetdir if not File.exists? $targetdir
     mkdir_p $srcdir if not File.exists? $srcdir
-    mkdir_p $libs if not File.exists? $libs
 
-  end
+  end #task 'config:android'
   
   namespace 'android' do
     task :extensions => ['config:android', 'build:bundle:noxruby'] do
     
       $ext_android_rhodes_activity_listener = []
-      $ext_android_manifest_changes= []
-      $ext_android_resources_addons = []
       $ext_android_additional_sources = {}
       $ext_android_additional_lib = []
       $ext_android_build_scripts = {}
+      $ext_android_manifest_changes = {}
+      $ext_android_adds = {}
 
       $app_config["extensions"].each do |ext|
         puts "#{ext} is processing..."
@@ -767,26 +482,71 @@ namespace "config" do
             extyml = File.join(p, ext,"ext.yml")
             if File.file? extyml
                 puts "#{extyml} is processing..."
+                
                 extconf = Jake.config(File.open(extyml))
+                extconf_android = extconf['android']
+                exttype = 'build'
+                exttype = extconf_android['exttype'] if extconf_android and extconf_android['exttype']
+                addspath = File.join($app_builddir,'extensions',ext,'adds')
+                prebuiltpath = nil
+                if exttype == 'prebuilt'
+                  prebuiltpath = Dir.glob(File.join(extpath, '**', 'android')) 
+                  if prebuiltpath.count == 1
+                    prebuiltpath = prebuiltpath.first
+                  else
+                    raise "android:exttype is 'prebuilt' but prebuilt path is not found #{prebuiltpath.inspect}"
+                  end
+                end
 
                 android_listener = extconf["android_rhodes_activity_listener"]
+                android_listener = extconf_android['rhodes_listener'] if android_listener.nil? and extconf_android
                 $ext_android_rhodes_activity_listener << android_listener unless android_listener.nil?
 
-                android_manifest_changes = extconf["android_manifest_changes"]
-                if android_manifest_changes != nil
-                  android_manifest_changes = File.join(p, ext, android_manifest_changes)
-                  $ext_android_manifest_changes << android_manifest_changes
+                manifest_changes = extconf["android_manifest_changes"]
+                manifest_changes = extconf_android['manifest_changes'] if manifest_changes.nil? and extconf_android
+                
+                if manifest_changes
+                  manifest_changes = [manifest_changes] unless manifest_changes.is_a? Array
+                  manifest_changes.map! { |path| File.join(p,ext,path) }
+                else
+                  if prebuiltpath
+                    manifest_changes = []
+
+                    path = File.join(prebuiltpath,'adds','AndroidManifest.rb')
+                    manifest_changes << path if File.file? path
+
+                    templates = Dir.glob File.join(prebuiltpath,'adds','*.erb')
+                    manifest_changes += templates
+                      
+                    if templates.empty?
+                      path = File.join(prebuiltpath,'adds','AndroidManifest.xml')
+                      manifest_changes << path if File.file? path
+                    end
+                  end
+                end
+                if manifest_changes
+                  $ext_android_manifest_changes[ext] = manifest_changes
                 end
 
-                android_resources_addons = extconf["android_resources_addons"]
-                if android_resources_addons != nil
-                  android_resources_addons = File.join(p, ext, android_resources_addons)
-                  $ext_android_resources_addons << android_resources_addons
+                resource_addons = extconf["android_resources_addons"]
+                resource_addons = extconf_android['adds'] if resource_addons.nil? and extconf_android
+                if resource_addons
+                  resource_addons = File.join(p, ext, resource_addons)
+                else
+                  if prebuiltpath
+                    resource_addons = File.join(prebuiltpath,'adds')
+                    resource_addons = nil unless File.directory? resource_addons
+                  end
+                end
+                
+                if resource_addons
+                  $ext_android_adds[ext] = resource_addons
                 end
 
-                android_additional_sources_list = extconf["android_additional_sources_list"]
-                unless android_additional_sources_list.nil?
-                  ext_sources_list = File.join(p, ext, android_additional_sources_list)
+                additional_sources = extconf["android_additional_sources_list"]
+                additional_sources = extconf_android['source_list'] if additional_sources.nil? and extconf_android
+                unless additional_sources.nil?
+                  ext_sources_list = File.join(p, ext, additional_sources)
 
                   if File.exists? ext_sources_list
                     $ext_android_additional_sources[File.join(p, ext)] = ext_sources_list
@@ -797,39 +557,54 @@ namespace "config" do
                   puts "No additional java sources for '#{ext}'"
                 end
 
+                # there is no 'additional_libs' param in android section moreover
+                # place libraries into android adds folder
                 android_additional_lib = extconf["android_additional_lib"]
                 if android_additional_lib != nil
                   android_additional_lib.each do |lib|
                     $ext_android_additional_lib << File.join(p, ext, lib)
                   end
                 end
+                
+                if prebuiltpath
+                  targetpath = File.join $app_builddir,'extensions',ext
+                  libaddspath = File.join addspath,'lib','armeabi'
+                  mkdir_p targetpath
+                  Dir.glob(File.join(prebuiltpath,'lib*.a')).each do |lib|
+                    cp lib, targetpath
+                  end
+                  Dir.glob(File.join(prebuiltpath,'*.jar')).each do |lib|
+                    cp lib, targetpath
+                  end
+                  Dir.glob(File.join(prebuiltpath,'**','lib*.so')).each do |lib|
+                    next if lib =~ /adds/
+                    if lib =~ /noautoload/
+                      mkdir_p File.join(libaddspath,'noautoload')
+                      cp lib, File.join(libaddspath,'noautoload')
+                    else
+                      mkdir_p libaddspath
+                      cp lib, libaddspath
+                    end
+                  end
+                end
 
                 puts  "#{extyml} is processed"
             end
 
-            build_script = File.join(extpath, 'build' + $bat_ext)
-            if RUBY_PLATFORM =~ /(win|w)32$/
-              $ext_android_build_scripts[extpath] = 'build.bat' if File.exists? build_script
+            if exttype == 'rakefile'
+              rakedir = Dir.glob File.join(extpath,'**','android')
+              $ext_android_build_scripts[ext] = [rakedir.first, 'rake']
             else
-                $ext_android_build_scripts[extpath] = File.join('.', 'build' + $bat_ext) if File.exists? build_script
-              
-                # modify executable attribute
-                if File.exists? build_script
-                  if !File.executable? build_script
-                       #puts 'change executable attribute for build script in extension : '+build_script
-                       begin
-                           #File.chmod 0700, build_script
-                           #puts 'executable attribute was writed for : '+build_script
-                       rescue Exception => e
-                           puts 'ERROR: can not change attribute for build script in extension ! Try to run build command with sudo: prefix.' 
-                       end    
-                  else
-                       puts 'build script in extension already executable : '+build_script
-                  end
+              build_script = File.join(extpath, 'build' + $bat_ext)
+              if File.exists? build_script
+                if RUBY_PLATFORM =~ /(win|w)32$/
+                  $ext_android_build_scripts[ext] = [extpath, 'build.bat']
                 else
-                  puts 'build script in extension not found => pure ruby extension'
+                  $ext_android_build_scripts[ext] = [extpath, File.join('.', 'build' + $bat_ext)]
                 end
+              end
             end
+
             puts "#{extpath} is configured"
             # to prevent to build 2 extensions with same name
             break
@@ -841,30 +616,80 @@ namespace "config" do
       
     end #task :extensions
 
-  end #namespace 'android'  
-end
+    task :emulator=>"config:android" do
+      $device_flag = "-e"
+      $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
+      $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
 
+      if RUBY_PLATFORM =~ /(win|w)32$/
+        $emulator = #"cmd /c " + 
+          File.join( $androidsdkpath, "tools", "emulator.exe" )
+      else
+        $emulator = File.join( $androidsdkpath, "tools", "emulator" )
+      end
 
-namespace "build" do
-  namespace "android" do
- #   desc "Generate R.java file"
-    task :rjava => "config:android" do
+      $emuversion = AndroidTools.get_market_version($min_sdk_level) if $emuversion.nil?
+      if $emuversion.nil?
+        raise "Wrong Android emulator version: #{$emuversion}. Android SDK target API is not installed"
+      end
 
-      manifest = $appmanifest
-      resource = $appres
-      assets = Jake.get_absolute File.join($tmpdir, 'assets')
-      nativelibs = Jake.get_absolute(File.join($androidpath, "Rhodes", "libs"))
-      #rjava = Jake.get_absolute(File.join($androidpath, "Rhodes", "gen", "com", "rhomobile", "rhodes"))
+      # Detect android targets
+      $androidtargets = {}
+      id = nil
 
-      args = ["package", "-f", "-M", manifest, "-S", resource, "-A", assets, "-I", $androidjar, "-J", $app_rjava_dir]
-      puts Jake.run($aapt, args)
+      `"#{$androidbin}" list targets`.split(/\n/).each do |line|
+        line.chomp!
+
+        if line =~ /^id:\s+([0-9]+)/
+          id = $1
+
+          if $use_google_addon_api
+            if line =~ /Google Inc\.:Google APIs:([0-9]+)/
+              apilevel = $1
+              $androidtargets[apilevel.to_i] = id.to_i
+            end
+          else
+            if $use_motosol_api
+              if line =~ /MotorolaSolutions\s+Inc\.:MotorolaSolution\s+Value\s+Add\s+APIs.*:([0-9]+)/
+                apilevel = $1
+                $androidtargets[apilevel.to_i] = id.to_i
+              end
+            end
+          end
+        end        
+
+        unless $use_google_addon_api or $use_motosol_api
+          if line =~ /^\s+API\s+level:\s+([0-9]+)$/
+            apilevel = $1
+            $androidtargets[apilevel.to_i] = id.to_i
+          end
+        end
 
-      unless $?.success?
-        puts "Error in AAPT"
-        exit 1
       end
 
+      if USE_TRACES
+        puts "Android emulator version: #{$emuversion}"
+        puts "Android targets:"
+        puts $androidtargets.inspect
+      end
+
+      $emuversion = $emuversion.to_s
+
+      $appavdname = $app_config["android"]["emulator"] if $app_config["android"] != nil && $app_config["android"].length > 0
+      $appavdname = $config["android"]["emulator"] if $appavdname.nil? and !$config["android"].nil? and $config["android"].length > 0
+
+    end # task 'config:android:emulator'
+    
+    task :device=>"config:android" do
+      $device_flag = "-d"
+
     end
+  end #namespace 'config:android'  
+end
+
+
+namespace "build" do
+  namespace "android" do
 
     desc "Build RhoBundle for android"
     task :rhobundle => ["config:android", :extensions] do
@@ -908,7 +733,6 @@ namespace "build" do
       ENV["RHO_APP_DIR"] = $app_path
       ENV["ANDROID_NDK"] = $androidndkpath
       ENV["ANDROID_API_LEVEL"] = $found_api_level.to_s
-      ENV["TARGET_TEMP_DIR"] = $extensionsdir
       ENV["RHO_ROOT"] = $startdir
       ENV["BUILD_DIR"] ||= $startdir + "/platform/android/build"
       ENV["RHO_INC"] = $appincdir
@@ -917,32 +741,63 @@ namespace "build" do
       ENV["NEON_ROOT"] = $neon_root unless $neon_root.nil?
       ENV["CONFIG_XML"] = $config_xml unless $config_xml.nil?
 
-      mkdir_p $extensionsdir unless File.directory? $extensionsdir
+      $ext_android_build_scripts.each do |ext, builddata|
+        #ext = File.basename(File.dirname(extpath))
+        ENV["TARGET_TEMP_DIR"] = File.join($app_builddir,'extensions',ext)
+        ENV['TEMP_FILES_DIR'] = File.join($tmpdir,ext)
+        mkdir_p ENV["TARGET_TEMP_DIR"] unless File.directory? ENV["TARGET_TEMP_DIR"]
+        mkdir_p ENV["TEMP_FILES_DIR"] unless File.directory? ENV["TEMP_FILES_DIR"]
 
-      $ext_android_build_scripts.each do |extpath, script|
-        ext = File.basename(File.dirname(extpath))
         puts "Executing extension build script: #{ext}"
-        ENV['TEMP_FILES_DIR'] = File.join(ENV["TARGET_TEMP_DIR"], ext)
-
-        if RUBY_PLATFORM =~ /(win|w)32$/
-             Jake.run(script, [], extpath)
+        if RUBY_PLATFORM =~ /(win|w)32$/ || (builddata[1] == 'rake')
+             Jake.run(builddata[1], [], builddata[0])
         else
-             #puts '$$$$$$$$$$$$$$$$$$     START'
              currentdir = Dir.pwd()      
-             Dir.chdir extpath 
-             sh %{$SHELL ./build}
+             Dir.chdir builddata[0]
+             sh %{$SHELL #{builddata[1]}}
              Dir.chdir currentdir 
-             #puts '$$$$$$$$$$$$$$$$$$     FINISH'
         end
-        raise "Cannot build #{extpath}" unless $?.success?
+        raise "Cannot build #{builddata[0]}" unless $?.success?
         puts "Extension build script finished"
       end
+      
+      $ext_android_manifest_changes.each do |ext, manifest_changes|
+        addspath = File.join($app_builddir,'extensions',ext,'adds')
+        mkdir_p addspath
+        manifest_changes.each do |path|
+          if File.extname(path) == '.xml'
+            cp path, File.join(addspath,'AndroidManifest.xml')
+          else 
+            if File.extname(path) == '.rb'
+              cp path, File.join(addspath,'AndroidManifest.rb')
+            else
+              if File.extname(path) == '.erb'
+                cp path, addspath
+              else
+                raise "Wrong AndroidManifest patch file: #{path}"
+              end
+            end
+          end
+        end
+      end
+
+      $ext_android_adds.each do |ext, path|
+        addspath = File.join($app_builddir,'extensions',ext,'adds')
+        mkdir_p addspath
+        Dir.glob(File.join(path,'*')).each do |add|
+          cp_r add, addspath if File.directory? add
+        end
+      end
+
     end #task :extensions
 
     task :libsqlite => "config:android" do
       srcdir = File.join($shareddir, "sqlite")
       objdir = $objdir["sqlite"]
       libname = $libname["sqlite"]
+      
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
 
       cc_build 'libsqlite', objdir, ["-I\"#{srcdir}\"", "-I\"#{$shareddir}\""] or exit 1
       cc_ar ('"'+(libname)+'"'), Dir.glob(objdir + "/**/*.o").collect{|x| '"'+x+'"'} or exit 1
@@ -961,6 +816,9 @@ namespace "build" do
       objdir = $objdir["curl"]
       libname = $libname["curl"]
 
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-DHAVE_CONFIG_H"
       args << "-I\"#{srcdir}/../include\""
@@ -975,6 +833,10 @@ namespace "build" do
       srcdir = File.join $shareddir, "ruby"
       objdir = $objdir["ruby"]
       libname = $libname["ruby"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-Wno-uninitialized"
       args << "-Wno-missing-field-initializers"
@@ -996,6 +858,10 @@ namespace "build" do
       srcdir = File.join $shareddir, "json"
       objdir = $objdir["json"]
       libname = $libname["json"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{srcdir}\""
       args << "-I\"#{srcdir}/..\""
@@ -1012,6 +878,9 @@ namespace "build" do
         objdir = $objdir["stlport"]
         libname = $libname["stlport"]
 
+        mkdir_p objdir
+        mkdir_p File.dirname(libname)
+
         args = []
         args << "-I\"#{$stlport_includes}\""
         args << "-DTARGET_OS=android"
@@ -1034,6 +903,10 @@ namespace "build" do
       srcdir = File.join $shareddir, "logging"
       objdir = $objdir["rholog"]
       libname = $libname["rholog"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{srcdir}/..\""
       args << "-I\"#{$std_includes}\"" unless $std_includes.nil?
@@ -1048,6 +921,10 @@ namespace "build" do
       srcdir = $shareddir
       objdir = $objdir["rhomain"]
       libname = $libname["rhomain"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{srcdir}\""
       args << "-I\"#{$std_includes}\"" unless $std_includes.nil?
@@ -1061,6 +938,10 @@ namespace "build" do
     task :librhocommon => "config:android" do
       objdir = $objdir["rhocommon"]
       libname = $libname["rhocommon"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{$shareddir}\""
       args << "-I\"#{$shareddir}/curl/include\""
@@ -1078,6 +959,10 @@ namespace "build" do
       srcdir = File.join $shareddir, "db"
       objdir = $objdir["rhodb"]
       libname = $libname["rhodb"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{srcdir}\""
       args << "-I\"#{srcdir}/..\""
@@ -1094,6 +979,10 @@ namespace "build" do
       srcdir = File.join $shareddir, "sync"
       objdir = $objdir["rhosync"]
       libname = $libname["rhosync"]
+
+      mkdir_p objdir
+      mkdir_p File.dirname(libname)
+
       args = []
       args << "-I\"#{srcdir}\""
       args << "-I\"#{srcdir}/..\""
@@ -1231,7 +1120,8 @@ namespace "build" do
         f.puts "public class NativeLibraries {"
         f.puts "  public static void load() {"
         f.puts "    // Load native .so libraries"
-        Dir.glob($extensionsdir + "/lib*.so").reverse.each do |lib|
+        Dir.glob($app_builddir + "/**/lib*.so").reverse.each do |lib|
+          next if lib =~ /noautoload/
           libname = File.basename(lib).gsub(/^lib/, '').gsub(/\.so$/, '')
           f.puts "    System.loadLibrary(\"#{libname}\");"
         end
@@ -1245,15 +1135,19 @@ namespace "build" do
     task :gensources => [:genconfig, :gen_java_ext]
 
     task :librhodes => [:libs, :gensources] do
+      srcdir = File.join $androidpath, "Rhodes", "jni", "src"
+      libdir = File.join $app_builddir,'librhodes','lib','armeabi'
+      objdir = File.join $tmpdir,'librhodes' 
+      libname = File.join libdir,'librhodes.so'
+
+      mkdir_p libdir
+      mkdir_p objdir
+    
       # add licence lib to build
-      lic_dst = $extensionsdir + "/libMotorolaLicence.a"
+      lic_dst = File.join $app_builddir,'librhodes','libMotorolaLicence.a'
       lic_src = $startdir + "/res/libs/motorolalicence/android/libMotorolaLicence.a"
       rm_f lic_dst
       cp lic_src, lic_dst 
-    
-      srcdir = File.join $androidpath, "Rhodes", "jni", "src"
-      objdir = File.join $bindir, "libs", $confdir, $ndkabi, $ndkgccver, "librhodes"
-      libname = File.join $bindir, "libs", $confdir, $ndkabi, $ndkgccver, "librhodes.so"
 
       args = []
       args << "-I\"#{$appincdir}\""
@@ -1278,21 +1172,10 @@ namespace "build" do
       end
 
       args = []
-      args << "-L\"#{$rhobindir}/#{$confdir}/#{$ndkabi}/#{$ndkgccver}\""
-      args << "-L\"#{$bindir}/libs/#{$confdir}/#{$ndkabi}/#{$ndkgccver}\""
-      args << "-L\"#{$extensionsdir}\""
-
+      args << "-L\"#{$rhobindir}/#{$confdir}\""
+      args << "-L\"#{libdir}\""
+            
       rlibs = []
-      rlibs << "rhomain"
-      rlibs << "ruby"
-      rlibs << "rhosync"
-      rlibs << "rhodb"
-      rlibs << "rholog"
-      rlibs << "rhocommon"
-      rlibs << "json"
-      rlibs << "stlport" if USE_OWN_STLPORT
-      rlibs << "curl"
-      rlibs << "sqlite"
       rlibs << "log"
       rlibs << "dl"
       rlibs << "z"
@@ -1300,7 +1183,12 @@ namespace "build" do
       rlibs.map! { |x| "-l#{x}" }
 
       elibs = []
-      extlibs = Dir.glob($extensionsdir + "/lib*.a") + Dir.glob($extensionsdir + "/lib*.so")
+      extlibs = Dir.glob($app_builddir + "/**/lib*.a")# + Dir.glob($app_builddir + "/**/lib*.so")
+      
+      extlibs.each do |lib|
+        args << "-L\"#{File.dirname(lib)}\""
+      end
+      
       stub = []
       extlibs.reverse.each do |f|
         lparam = "-l" + File.basename(f).gsub(/^lib/,"").gsub(/\.(a|so)$/,"")
@@ -1315,11 +1203,10 @@ namespace "build" do
       end
 
       args += elibs
-      args += rlibs
       args += elibs
       args += rlibs
 
-  	  mkdir_p File.dirname(libname) unless File.directory? File.dirname(libname)
+  	  #mkdir_p File.dirname(libname) unless File.directory? File.dirname(libname)
       cc_link libname, Dir.glob(objdir + "/**/*.o").collect{|x| '"'+x+'"'}, args, deps or exit 1
 
       destdir = File.join($androidpath, "Rhodes", "libs", "armeabi")
@@ -1328,15 +1215,80 @@ namespace "build" do
       cc_run($stripbin, ['"'+File.join(destdir, File.basename(libname))+'"'])
     end
 
- #   desc "Build Rhodes for android"
-    task :rhodes => [:rhobundle, :librhodes] do
+    task :manifest => ["config:android", :extensions] do
 
-      set_app_name_android($appname)
+      version = {'major' => 0, 'minor' => 0, 'patch' => 0}
+      if $app_config["version"]
+        if $app_config["version"] =~ /^(\d+)$/
+          version["major"] = $1.to_i
+        elsif $app_config["version"] =~ /^(\d+)\.(\d+)$/
+          version["major"] = $1.to_i
+          version["minor"] = $2.to_i
+        elsif $app_config["version"] =~ /^(\d+)\.(\d+)\.(\d+)$/
+          version["major"] = $1.to_i
+          version["minor"] = $2.to_i
+          version["patch"] = $3.to_i
+        end
+      end
 
-      rm_rf $tmpdir + "/Rhodes"
-      mkdir_p $tmpdir + "/Rhodes"
+      version = version["major"]*10000 + version["minor"]*100 + version["patch"]
+      
+      usesPermissions = ['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?
+        cap = [cap] unless cap.is_a? Array
+
+        cap.each do |cap_item|
+          if cap_item.is_a? Proc
+            #caps_proc << cap_item
+            next
+          end
+        
+          if cap_item.is_a? String
+            usesPermissions << "android.permission.#{cap_item}"
+            next
+          end
+        end
+      end
+      usesPermissions.uniq!
+      
+      hidden = get_boolean($app_config['hidden_app'])
+
+      generator = ManifestGenerator.new JAVA_PACKAGE_NAME, $app_package_name, hidden, usesPermissions
+      
+      generator.versionName = $app_config["version"]
+      generator.versionCode = version
+      generator.installLocation = 'auto'
+      generator.minSdkVer = $min_sdk_level
+      generator.maxSdkVer = $max_sdk_level
+
+      generator.usesLibraries['com.google.android.maps'] = true if $use_google_addon_api
+      generator.addGooglePush(File.join($androidpath,'Rhodes','PushReceiver.erb')) if $app_config["capabilities"].index 'push'
+
+      generator.addUriParams $uri_scheme, $uri_host, $uri_path_prefix
+      
+      Dir.glob(File.join($app_builddir,'extensions','*','adds','AndroidManifest.rb')).each do |extscript|
+        puts "Evaluating #{extscript}"
+        eval(File.new(extscript).read)
+      end
+      Dir.glob(File.join($app_builddir,'extensions','*','adds','Manifest*.erb')).each do |exttemplate|
+        puts "Adding template #{exttemplate}"
+        generator.manifestManifestAdds << exttemplate
+      end
+      Dir.glob(File.join($app_builddir,'extensions','*','adds','Application*.erb')).each do |exttemplate|
+        puts "Adding template #{exttemplate}"
+        generator.applicationManifestAdds << exttemplate
+      end
+
+      manifest = generator.render $rhomanifesterb
+      
+      File.open($appmanifest, "w") { |f| f.write manifest }
+
+
+      #######################################################
+      # Deprecated staff below 
 
-      $ext_android_manifest_changes << File.join($extensionsdir, "AndroidManifest.xml")
 
       app_f = File.new($appmanifest)
       manifest_orig_doc = REXML::Document.new(app_f)
@@ -1351,16 +1303,10 @@ namespace "build" do
             puts '          $$$ FOUND !'
             dst_main_activity = a
         end
-        if $android_orientation != nil
-            if a.attribute('screenOrientation','android').to_s == 'unspecified'
-                a.add_attribute('android:screenOrientation', $android_orientation)
-            end
-        end
       end
 
-      $ext_android_manifest_changes.each do |m|
+      Dir.glob(File.join($app_builddir,'extensions','*','adds','AndroidManifest.xml')).each do |ext_manifest|
 
-        ext_manifest = m
         if File.exists? ext_manifest
           puts 'AndroidManifest.xml['+ext_manifest+'] from native extension found !'
 
@@ -1408,16 +1354,6 @@ namespace "build" do
 
       end
 
-      #puts 'Result Manifest :'
-      #manifest_orig_doc.elements['manifest'].elements.each do |e|
-      #   puts '     + '+e.xpath
-      #   if e.xpath == '/manifest/application'
-      #       manifest_orig_doc.elements['manifest/application'].elements.each do |t|
-      #             puts '              + '+t.xpath
-      #       end
-      #   end
-      #end
-
       puts 'delete original manifest'
       File.delete($appmanifest)
 
@@ -1427,6 +1363,17 @@ namespace "build" do
 
       #rm tappmanifest
       puts 'Manifest updated by extension is saved!'
+    end
+    
+    task :resources => [:rhobundle, :extensions] do
+      set_app_name_android($appname)
+    end
+
+    #desc "Build Rhodes for android"
+    task :rhodes => [:rhobundle, :librhodes, :manifest, :resources] do
+
+      rm_rf $tmpdir + "/Rhodes"
+      mkdir_p $tmpdir + "/Rhodes"
 
 
       # RhodesActivity Listeners
@@ -1445,13 +1392,10 @@ namespace "build" do
       Jake.modify_file_if_content_changed($app_startup_listeners_java, f)
 
       puts 'EXT:  add additional files to project before build'
-      $ext_android_resources_addons.each do |r|
-         puts 'add resources from extension copy ['+r+'] to ['+$tmpdir+']'
-          Dir.foreach(r) do |f|
-             cp = File.join(r, f)
-             if ((File.directory?(cp)) || (File.file?(cp))) && ((f != '.') && ( f != '..'))
-                cp_r cp,$tmpdir
-             end
+      Dir.glob(File.join($app_builddir,'extensions','*','adds','*')).each do |res|
+          if File.directory?(res) && (res != '.') && (res != '..')
+            puts "add resources from extension [#{res}] to [#{$tmpdir}]"
+            cp_r res, $tmpdir
           end
       end
       
@@ -1498,21 +1442,16 @@ namespace "build" do
       srclist = newsrclist
 
       classpath = $androidjar
-      classpath += $path_separator + $gapijar unless $gapijar.nil?
-      classpath += $path_separator + $motosol_jar unless $motosol_jar.nil?
+      classpath += $path_separator + $google_classpath if $google_classpath
+      classpath += $path_separator + $motosol_classpath if $motosol_classpath
       classpath += $path_separator + File.join($tmpdir, 'Rhodes')
-#      Dir.glob(File.join($extensionsdir, "*.jar")).each do |f|
-#        classpath += $path_separator + f
-#      end
 
       javafilelists = [srclist]
 
-      extlist = File.join $extensionsdir, "ext_build.files"
+      extlist = File.join $app_builddir, "ext_build.files"
       if File.exists? extlist
         puts "#{extlist} is found! THere are addditional java files"
         javafilelists << extlist
-      else
-        puts 'ext_build.files not found - no additional java files'
       end
 
       java_compile(File.join($tmpdir, 'Rhodes'), classpath, javafilelists)
@@ -1523,7 +1462,7 @@ namespace "build" do
         files << relpath
       end
       unless files.empty?
-        jar = File.join($bindir, 'Rhodes.jar')
+        jar = File.join($app_builddir,'librhodes','Rhodes.jar')
         args = ["cf", jar]
         args += files
         Jake.run($jarbin, args, File.join($tmpdir, "Rhodes"))
@@ -1538,10 +1477,10 @@ namespace "build" do
       puts 'Compile additional java files:'
 
       classpath = $androidjar
-      classpath += $path_separator + $gapijar unless $gapijar.nil?
-      classpath += $path_separator + $motosol_jar unless $motosol_jar.nil?
+      classpath += $path_separator + $google_classpath if $google_classpath
+      classpath += $path_separator + $motosol_classpath if $motosol_classpath
       classpath += $path_separator + File.join($tmpdir, 'Rhodes')
-      Dir.glob(File.join($extensionsdir, '*.jar')).each do |jar|
+      Dir.glob(File.join($app_builddir,'**','*.jar')).each do |jar|
         classpath += $path_separator + jar
       end
 
@@ -1569,7 +1508,7 @@ namespace "build" do
         #Dir.chdir currentdir 
         #puts '$$$$$$$$$$$$$$$$$$     FINISH'
 
-        extjar = File.join $bindir, ext + '.jar'
+        extjar = File.join $app_builddir,'extensions',ext,ext + '.jar'
         args = ["cf", extjar, '.']
         Jake.run($jarbin, args, File.join($tmpdir, ext))
         unless $?.success?
@@ -1579,6 +1518,9 @@ namespace "build" do
       end
     end
 
+    task :extensions_adds => "config:android:extensions" do
+    end
+
     task :upgrade_package => :rhobundle do
         #puts '$$$$$$$$$$$$$$$$$$'
         #puts 'targetdir = '+$targetdir.to_s
@@ -1588,7 +1530,96 @@ namespace "build" do
         zip_file_path = File.join(android_targetdir, 'upgrade_bundle.zip')
         Jake.build_file_map(File.join($srcdir, "apps"), "rhofilelist.txt")
         Jake.zip_upgrade_bundle($bindir, zip_file_path)
+    end
+    
+    task :upgrade_package_partial => ["build:android:rhobundle"] do
+        #puts '$$$$$$$$$$$$$$$$$$'
+        #puts 'targetdir = '+$targetdir.to_s
+        #puts 'bindir = '+$bindir.to_s
+
+        # process partial update
+      
+        add_list_full_name = File.join($app_path, 'upgrade_package_add_files.txt')
+        remove_list_full_name = File.join($app_path, 'upgrade_package_remove_files.txt')
+      
+        src_folder = File.join($bindir, 'RhoBundle')
+        src_folder = File.join(src_folder, 'apps')
+      
+        tmp_folder = $bindir + '_tmp_partial'
+        rm_rf tmp_folder if File.exists? tmp_folder
+        mkdir_p tmp_folder
+
+        dst_tmp_folder = File.join(tmp_folder, 'RhoBundle')
+        mkdir_p dst_tmp_folder
+        # copy all
+        cp_r src_folder, dst_tmp_folder
+        
+        dst_tmp_folder = File.join(dst_tmp_folder, 'apps')
+        mkdir_p dst_tmp_folder
+
+        add_files = []
+        if File.exists? add_list_full_name
+           File.open(add_list_full_name, "r") do |f|
+              while line = f.gets
+                 fixed_path = line.gsub('.rb', '.iseq').gsub('.erb', '_erb.iseq').chop
+                 add_files << fixed_path
+                 puts '### ['+fixed_path+']'
+              end
+           end
+        end
+        
+        remove_files = []
+        if File.exists? remove_list_full_name
+           File.open(remove_list_full_name, "r") do |f|
+              while line = f.gets
+                 fixed_path = line.gsub('.rb', '.iseq').gsub('.erb', '_erb.iseq').chop
+                 remove_files << fixed_path
+                 #puts '### ['+fixed_path+']'
+              end
+           end
+        end
+
+        psize = dst_tmp_folder.size+1
+        Dir.glob(File.join(dst_tmp_folder, '**/*')).sort.each do |f|
+          relpath = f[psize..-1]
+
+          if File.file?(f)
+             #puts '$$$ ['+relpath+']'
+             if not add_files.include?(relpath)
+                 rm_rf f
+             end 
+          end
+        end
+        
+        Jake.build_file_map( dst_tmp_folder, "upgrade_package_add_files.txt" )
+                 
+        #if File.exists? add_list_full_name
+        #   File.open(File.join(dst_tmp_folder, 'upgrade_package_add_files.txt'), "w") do |f|
+        #      add_files.each do |j|
+        #         f.puts "#{j}\tfile\t0\t0"
+        #      end
+        #   end
+        #end
+
+        if File.exists? remove_list_full_name
+           File.open(File.join(dst_tmp_folder, 'upgrade_package_remove_files.txt'), "w") do |f|
+              remove_files.each do |j|
+                 f.puts "#{j}"
+                 #f.puts "#{j}\tfile\t0\t0"
+              end
+           end
+        end
+
+        mkdir_p $targetdir if not File.exists? $targetdir
+        zip_file_path = File.join($targetdir, "upgrade_bundle_partial.zip")
+        Jake.zip_upgrade_bundle( tmp_folder, zip_file_path)
+        rm_rf tmp_folder
     end    
+        
+            
+                
+                    
+                            
     
     #desc "build all"
     task :all => [:rhobundle, :rhodes, :extensions_java]
@@ -1604,13 +1635,12 @@ namespace "package" do
     args << $dxjar
     args << "--dex"
     args << "--output=#{$bindir}/classes.dex"
-    $android_jars.each do |jar|
-        args << jar
-    end
-    Dir.glob(File.join($extensionsdir, "*.jar")).each do |jar|
+
+    Dir.glob(File.join($app_builddir,'**','*.jar')).each do |jar|
         args << jar
     end
-    Jake.run("java", args)
+
+    Jake.run(File.join($java, 'java'+$exe_ext), args)
     unless $?.success?
       raise "Error running DX utility"
     end
@@ -1626,7 +1656,7 @@ namespace "package" do
     #set_app_name_android($appname)
 
     args = ["package", "-f", "-M", manifest, "-S", resource, "-A", assets, "-I", $androidjar, "-F", resourcepkg]
-    puts Jake.run($aapt, args)
+    Jake.run($aapt, args)
     unless $?.success?
       raise "Error running AAPT (1)"
     end
@@ -1637,21 +1667,20 @@ namespace "package" do
       relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s
       puts "Add #{relpath} to #{resourcepkg}..."
       args = ["uf", resourcepkg, relpath]
-      puts Jake.run($jarbin, args, $tmpdir)
+      Jake.run($jarbin, args, $tmpdir)
       unless $?.success?
         raise "Error running AAPT (2)"
       end
     end
 
+    puts "Packaging Native Libs"
+
     # Add native librhodes.so
-    rm_rf File.join($tmpdir, "lib")
+    #rm_rf File.join($tmpdir, "lib")
     mkdir_p File.join($tmpdir, "lib/armeabi")
-    cp_r File.join($bindir, "libs", $confdir, $ndkabi, $ndkgccver, "librhodes.so"), File.join($tmpdir, "lib/armeabi")
+    cp_r File.join($app_builddir,'librhodes','lib','armeabi','librhodes.so'), File.join($tmpdir, "lib/armeabi")
     # Add extensions .so libraries
-    Dir.glob($extensionsdir + "/lib*.so").each do |lib|
-      cp_r lib, File.join($tmpdir, "lib/armeabi")
-    end
-    Dir.glob($extensionsdir + '/noautoload/lib*.so').each do |lib|
+    Dir.glob($app_builddir + "/**/lib*.so").each do |lib|
       cp_r lib, File.join($tmpdir, "lib/armeabi")
     end
     $ext_android_additional_lib.each do |lib|
@@ -1663,9 +1692,9 @@ namespace "package" do
       cc_run($stripbin, ['"'+lib+'"'])
       args << "lib/armeabi/#{File.basename(lib)}"
     end
-    puts Jake.run($jarbin, args, $tmpdir)
+    Jake.run($jarbin, args, $tmpdir)
     err = $?
-    rm_rf $tmpdir + "/lib"
+    #rm_rf $tmpdir + "/lib"
     unless err.success?
       raise "Error running AAPT (3)"
     end
@@ -1691,7 +1720,8 @@ namespace "device" do
       args << "4"
       args << simple_apkfile
       args << final_apkfile
-      puts Jake.run($zipalign, args)
+      out = Jake.run2($zipalign, args, :hide_output => true)
+      puts out if USE_TRACES
       unless $?.success?
         puts "Error running zipalign"
         exit 1
@@ -1707,6 +1737,7 @@ namespace "device" do
 
     task :install => :debug do
       apkfile = $targetdir + "/" + $appname + "-debug.apk"
+      Jake.run $adb, ['-d', 'wait-for-device']
       puts "Install APK file"
       Jake.run($adb, ["-d", "install", "-r", apkfile])
       unless $?.success?
@@ -1744,7 +1775,7 @@ namespace "device" do
         args << $storepass
         args << "-keypass"
         args << $keypass
-        puts Jake.run($keytool, args)
+        Jake.run($keytool, args)
         unless $?.success?
           puts "Error generating keystore file"
           exit 1
@@ -1766,7 +1797,7 @@ namespace "device" do
       args << signed_apkfile
       args << simple_apkfile
       args << $storealias
-      puts Jake.run($jarsigner, args)
+      Jake.run($jarsigner, args)
       unless $?.success?
         puts "Error running jarsigner"
         exit 1
@@ -1779,7 +1810,7 @@ namespace "device" do
       args << "4"
       args << '"' + signed_apkfile + '"'
       args << '"' + final_apkfile + '"'
-      puts Jake.run($zipalign, args)
+      Jake.run($zipalign, args)
       unless $?.success?
         puts "Error running zipalign"
         exit 1
@@ -1817,6 +1848,12 @@ namespace "run" do
   namespace "android" do
     
     task :spec => ["device:android:debug"] do
+    
+        if $device_flag == '-e'
+            Rake::Task["config:android:emulator"].invoke
+        else
+            Rake::Task["config:android:device"].invoke
+        end
 
         log_name  = $app_path + '/RhoLogSpec.txt'
         File.delete(log_name) if File.exist?(log_name)
@@ -1907,7 +1944,7 @@ namespace "run" do
 
     namespace "phone_spec" do
       task :device do
-        $device_flag = "-d"
+        $device_flag = '-d'
         Jake.run_spec_app('android','phone_spec')
         unless $dont_exit_on_failure
           exit 1 if $total.to_i==0
@@ -1916,7 +1953,7 @@ namespace "run" do
       end
 
       task :emulator do
-        $device_flag = "-e"
+        $device_flag = '-e'
         Jake.run_spec_app('android','phone_spec')
         unless $dont_exit_on_failure
           exit 1 if $total.to_i==0
@@ -1927,7 +1964,7 @@ namespace "run" do
 
     namespace "framework_spec" do
       task :device do
-        $device_flag = "-d"
+        $device_flag = '-d'
         Jake.run_spec_app('android','framework_spec')
         unless $dont_exit_on_failure
           exit 1 if $total.to_i==0
@@ -1936,7 +1973,7 @@ namespace "run" do
       end
 
       task :emulator do
-        $device_flag = "-e"
+        $device_flag = '-e'
         Jake.run_spec_app('android','framework_spec')
         unless $dont_exit_on_failure
           exit 1 if $total.to_i==0
@@ -1966,7 +2003,7 @@ namespace "run" do
       exit $failed.to_i
     end
 
-    task :emulator => "device:android:debug" do
+    task :emulator=>['config:android:emulator', 'device:android:debug']  do
         run_emulator
         load_app_and_run
     end
@@ -1994,61 +2031,64 @@ namespace "run" do
         Rake::Task["run:rhosimulator_debug"].invoke            
     end
     
-    task :get_info => "config:android" do
-        $androidtargets.each do |level|
-            puts "#{get_market_version(level[0])}"
-        end
-
-        emu_version = $emuversion
-        
-        puts ""        
-        cur_name = ""
-        
-        `"#{$androidbin}" list avd`.split(/\n/).each do |line|
-            line.each_line do |item|
-                ar = item.split(':')
-                ar[0].strip!
-                if ar[0] == "Name"
-                    cur_name = ar[1].strip!
-                    puts "#{cur_name}"
-                end
-                
-                if $appavdname && cur_name == $appavdname && (ar[0] == "Target" || ar.length == 1)
-                    
-                    text = ar[0] == "Target" ? ar[1] : ar[0]
-                    
-                    nAnd = text.index("Android")
-                    if nAnd
-                        nAnd = text.index(" ", nAnd)
-                        nAnd1 = text.index("-", nAnd+1)                    
-                        nAnd1 = text.index(" ", nAnd+1) unless nAnd1
-                        emu_version = text[nAnd+1, nAnd1-nAnd-1]
-                    end    
-                end
-                
-            end    
-        end
-
-        puts ""
-
-        puts "#{emu_version}"
-        puts "#{$appavdname}"
-
-    end
+#    task :get_info => "config:android" do
+#        $androidtargets.each do |level|
+#            puts "#{get_market_version(level[0])}"
+#        end
+#
+#        emu_version = $emuversion
+#        
+#        puts ""        
+#        cur_name = ""
+#        
+#        `"#{$androidbin}" list avd`.split(/\n/).each do |line|
+#            line.each_line do |item|
+#                ar = item.split(':')
+#                ar[0].strip!
+#                if ar[0] == "Name"
+#                    cur_name = ar[1].strip!
+#                    puts "#{cur_name}"
+#                end
+#                
+#                if $appavdname && cur_name == $appavdname && (ar[0] == "Target" || ar.length == 1)
+#                    
+#                    text = ar[0] == "Target" ? ar[1] : ar[0]
+#                    
+#                    nAnd = text.index("Android")
+#                    if nAnd
+#                        nAnd = text.index(" ", nAnd)
+#                        nAnd1 = text.index("-", nAnd+1)                    
+#                        nAnd1 = text.index(" ", nAnd+1) unless nAnd1
+#                        emu_version = text[nAnd+1, nAnd1-nAnd-1]
+#                    end    
+#                end
+#            end    
+#        end
+#
+#        puts ""
+#
+#        puts "#{emu_version}"
+#        puts "#{$appavdname}"
+#
+#    end
 
     def  run_emulator(options = {})
       apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
 
       #AndroidTools.kill_adb
       Jake.run($adb, ['start-server'], nil, true)
-      #puts 'Sleep for 5 sec. waiting for "adb start-server"'
-      #sleep 5
 
       rm_f $applog_path if !$applog_path.nil?
       AndroidTools.logcat_process()
 
       running = AndroidTools.is_emulator_running
       if !running
+        $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
+        $avdname += "google" if $use_google_addon_api
+        $avdname += "motosol" if $use_motosol_api
+        $avdtarget = $androidtargets[get_api_level($emuversion)]
+
+        raise "Unable to run Android emulator. No appropriate target API for SDK version: #{$emuversion}" unless $avdtarget
 
         if $appavdname != nil
           $avdname = $appavdname
@@ -2057,15 +2097,6 @@ namespace "run" do
         createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 128M "
         system("echo no | #{createavd}") unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
 
-        if $use_google_addon_api
-          avdini = File.join(ENV['HOME'], '.android', 'avd', "#{$avdname}.ini")
-          avd_using_gapi = true if File.new(avdini).read =~ /:Google APIs:/
-          unless avd_using_gapi
-            puts "Can not use specified AVD (#{$avdname}) because of incompatibility with Google APIs. Delete it and try again."
-            exit 1
-          end
-        end
-
         # Start the emulator, check on it every 5 seconds until it's running
         cmd = "\"#{$emulator}\" -cpu-delay 0"
         cmd << " -no-window" if options[:hidden]
@@ -2231,34 +2262,14 @@ namespace "clean" do
   desc "Clean Android"
   task :android => "clean:android:all"
   namespace "android" do
-    task :assets => "config:android" do
-      Dir.glob($androidpath + "/Rhodes/assets/**/*") do |f|
-        rm f, :force => true unless f =~ /\/loading\.html$/
-      end
-    end
     task :files => "config:android" do
       rm_rf $targetdir
-      #rm_rf $bindir
-      rm_rf File.join( $bindir, "libs" )
+      rm_rf $app_builddir
       Dir.glob( File.join( $bindir, "*.*" ) ) { |f| rm f, :force => true }
       rm_rf $srcdir
-      rm_rf $libs
       rm_rf $tmpdir
     end
-  task :libsqlite => "config:android" do
-    cc_clean "sqlite"
-  end
-  task :libs => ["config:android"] do
-    $native_libs.each do |l|
-      cc_clean l
-    end
-  end
-  task :librhodes => "config:android" do
-    rm_rf $rhobindir + "/" + $confdir + "/" + $ndkabi + "/" + $ndkgccver + "/librhodes"
-    rm_rf $bindir + "/libs/" + $confdir + "/" + $ndkabi + "/" + $ndkgccver + "/librhodes.so"
-  end
-#  desc "clean android"
-  task :all => [:assets,:librhodes,:libs,:files] 
+  task :all => :files 
   end
 end