rhodes 7.4.1 → 7.5.1

data/platform/android/build/android.rake

@@ -27,16 +27,21 @@
 require File.dirname(__FILE__) + '/androidcommon.rb'
 require File.dirname(__FILE__) + '/android_tools.rb'
 require File.dirname(__FILE__) + '/apk_builder.rb'
-require File.dirname(__FILE__) + '/aab_builder.rb'
+require File.dirname(__FILE__) + '/aapt2_helper.rb'
 require File.dirname(__FILE__) + '/maven_deps_extractor.rb'
 require File.dirname(__FILE__) + '/manifest_generator.rb'
 require File.dirname(__FILE__) + '/eclipse_project_generator.rb'
 require File.dirname(__FILE__) + '/android_studio_project_generator.rb'
 require File.dirname(__FILE__) + '/android_debug.rb'
 require File.dirname(__FILE__) + '/../../../lib/build/BuildConfig'
+
+require_relative 'dex_builder'
+require_relative 'build_tools_finder'
+
 load File.dirname(__FILE__) + '/android-repack.rake'
 require 'pathname'
 require 'tempfile'
+require 'zip'
 
 include FileUtils
 
@@ -58,7 +63,7 @@ JAVA_PACKAGE_NAME = 'com.rhomobile.rhodes'
 # market names (such as "Android-1.5" etc) see output of
 # command "android list targets"
 ANDROID_MIN_SDK_LEVEL = 21 #21 is the minimum API that supports arm64
-ANDROID_SDK_LEVEL = 29
+ANDROID_SDK_LEVEL = 31
 
 ANDROID_PERMISSIONS = {
     'audio' => ['RECORD_AUDIO', 'MODIFY_AUDIO_SETTINGS'],
@@ -570,29 +575,30 @@ def select_aapt2
 end
 
 
-def init_aab_builder
-  builder = AabBuilder.instance
+def init_aapt2_helper
+  helper = Aapt2Helper.instance
 
-  builder.logger = $logger
-  builder.res_dir = $appres
-  builder.output_path = $targetdir
-  builder.dex_path = File.join( $bindir, 'classes.dex' )
-  builder.apk_path = File.join( $bindir, 'rhodes.ap_')
+  helper.logger = $logger
+  helper.res_dir = $appres
+  helper.output_path = $targetdir
+  helper.dex_path = File.join( $bindir, 'classes.dex' )
+  helper.apk_path = File.join( $bindir, 'rhodes.ap_')
   #builder.res_dirs << AndroidTools::MavenDepsExtractor.instance.res_dirs
 
-  builder.build_dir = $tmpdir
-  builder.androidjar = $androidjar
-  builder.manifest = $appmanifest
+  helper.build_dir = $tmpdir
+  helper.androidjar = $androidjar
+  helper.manifest = $appmanifest
 
-  builder.aapt2 = select_aapt2
-  builder.bundletool = $bundletool
-  builder.javabin = File.join( $java, 'java' + $exe_ext )
-  builder.rjava_dir = $app_rjava_dir
-  builder.maven_deps = AndroidTools::MavenDepsExtractor.instance
+  helper.aapt2 = select_aapt2
+  helper.bundletool = $bundletool
+  helper.javabin = File.join( $java, 'java' + $exe_ext )
+  helper.rjava_dir = $app_rjava_dir
+  helper.maven_deps = AndroidTools::MavenDepsExtractor.instance
+  helper.assets_dir = $appassets
 
-  builder.no_compress_exts = $no_compression
+  helper.no_compress_exts = $no_compression
 
-  builder.init
+  helper.init
 end
 
 namespace "config" do
@@ -748,7 +754,8 @@ namespace "config" do
     $srcdir = File.join $tmpdir,'assets' #File.join($bindir, "RhoBundle")
 
     $rhomanifesterb = File.join($app_path, $app_config['android']['manifest_template']) unless $app_config["android"].nil? || $app_config['android']['manifest_template'].nil?
-    $rhomanifesterb = File.join $androidpath, "Rhodes", "AndroidManifest.xml.erb" if $rhomanifesterb.nil?
+    #$rhomanifesterb = File.join $androidpath, "Rhodes", "AndroidManifest.xml.erb" if $rhomanifesterb.nil?
+    $rhomanifesterb = File.join $startdir, 'res', 'generators', 'templates', 'application', 'AndroidManifest.erb' if $rhomanifesterb.nil?
 
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
 
@@ -787,66 +794,29 @@ namespace "config" do
       # TODO: add ruby executable for Linux
     end
 
-    AndroidTools::MavenDepsExtractor.instance.set_logger($logger)
-    AndroidTools::MavenDepsExtractor.instance.set_temp_dir($tmpdir)
-    AndroidTools::MavenDepsExtractor.instance.set_java_home($java)
-
-
-    build_tools_path = nil
+    build_tools_ver = nil
 
     if !$skip_checking_Android_SDK
-      if File.exist?(File.join($androidsdkpath, "build-tools"))
 
+      AndroidTools::MavenDepsExtractor.instance.set_logger($logger)
+      AndroidTools::MavenDepsExtractor.instance.set_temp_dir($tmpdir)
+      AndroidTools::MavenDepsExtractor.instance.set_java_home($java)
 
+      toolsver = $app_config['android']['buildtools'] if ($app_config['android'] and $app_config['android']['buildtools'])
+      build_tools_path = AndroidTools::findBuildToolsPath(toolsver,$androidsdkpath,$androidplatform)
 
-        toolsver = $app_config['android']['buildtools'] if ($app_config['android'] and $app_config['android']['buildtools'])
+      $logger.info "Detected Android build tools at #{build_tools_path}"
 
-        if toolsver
-          #will try to find user-specified build tools
-          path = File.join($androidsdkpath,'build-tools',toolsver)
-          if File.directory?(path)
-            build_tools_path = toolsver
-          else
-            $logger.warn("Android build tools v#{toolsver} specified in build.yml were not found, will use latest")
-          end
-        end
-
-
-        build_tools = {}
+      $aapt2 = File.join(build_tools_path, "aapt2#{$exe_ext}")
 
-        if !build_tools_path
-          Dir.foreach(File.join($androidsdkpath, "build-tools")) do |entry|
-            next if entry == '.' or entry == '..'
+      $aapt = File.join(build_tools_path, "aapt#{$exe_ext}")
+      $aapt = File.join($androidsdkpath, "platform-tools", "aapt" + $exe_ext) unless File.exists? $aapt
 
-            #Lets read source.properties file to get highest available build-tools
-            src_prop_path = File.join($androidsdkpath, "build-tools",entry,"source.properties")
-            next unless File.file?(src_prop_path)
-
-            File.open(src_prop_path) do |f|
-              f.each_line do |line|
-                build_tools[entry] = line.split('=')[1].gsub("\n",'') if line.match(/^Pkg.Revision=/)
-              end
-            end
-          end
-
-          latest_build_tools = build_tools.sort_by{|folder_name,sdk_version| sdk_version}.last
-          build_tools_path = latest_build_tools[0]
-        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
-        $aapt = File.join($androidsdkpath, "platforms", $androidplatform, "tools", "aapt" + $exe_ext)
-        $aapt = File.join($androidsdkpath, "platform-tools", "aapt" + $exe_ext) unless File.exists? $aapt
-      end
+      AndroidTools::DexBuilder.instance.logger = $logger
+      AndroidTools::DexBuilder.instance.sdk_path = $androidsdkpath
+      AndroidTools::DexBuilder.instance.build_tools_path = build_tools_path
+      AndroidTools::DexBuilder.instance.androidplatform = $androidplatform
+      AndroidTools::DexBuilder.instance.javabin = File.join($java, 'java'+$exe_ext)
 
       $bundletool = File.join($startdir, "res", "build-tools", "bundletool.jar")
 
@@ -871,6 +841,7 @@ namespace "config" do
       $keytool = File.join($java, "keytool" + $exe_ext)
       $jarsigner = File.join($java, "jarsigner" + $exe_ext)
       $jarbin = File.join($java, "jar" + $exe_ext)
+      $javabin = File.join( $java, 'java' + $exe_ext )
 
       $keystore = nil
       $keystore = $app_config["android"]["production"]["certificate"] if !$app_config["android"].nil? and !$app_config["android"]["production"].nil?
@@ -895,6 +866,7 @@ namespace "config" do
       AndroidTools.jarsigner = $jarsigner
       AndroidTools.zipalign = $zipalign
       AndroidTools.keytool = $keytool
+      AndroidTools.jarbin = $jarbin
       AndroidTools.apksigner = File.join(build_tools_path,'apksigner'+$bat_ext)
     end
 
@@ -945,12 +917,24 @@ namespace "config" do
         $google_classpath = AndroidTools::get_addon_classpath('Google APIs', $found_api_level)
       end
 
-      AndroidTools::MavenDepsExtractor.instance.add_dependency('com.android.support:support-v4:25.2.0')
-      AndroidTools::MavenDepsExtractor.instance.add_dependency('org.conscrypt:conscrypt-android:2.5.1')
-
       #setup_ndk($androidndkpath, $found_api_level, 'arm')
       $abis = $app_config['android']['abis'] if $app_config["android"]
       $abis = ['arm'] unless $abis
+
+      #build config
+      core_build_cfg = {}
+
+      begin
+        core_build_cfg = YAML.load_file(File.join( $builddir, 'config.yml'))
+      rescue Exception => e
+        $logger.warn "Can't read core build config: #{e.inspect}"
+      end
+
+      if core_build_cfg['maven_deps']
+        core_build_cfg['maven_deps'].each { |d|
+          AndroidTools::MavenDepsExtractor.instance.add_dependency( d )      
+        }
+      end
     end
     
     unless $debug
@@ -1030,7 +1014,7 @@ namespace "config" do
     mkdir_p $targetdir if not File.exists? $targetdir
     mkdir_p $srcdir if not File.exists? $srcdir
 
-    init_aab_builder if $build_bundle
+    init_aapt2_helper
 
     print_timestamp('config:android FINISH')
 
@@ -1285,12 +1269,6 @@ namespace "config" do
 
       AndroidTools::MavenDepsExtractor.instance.extract_all
 
-      if !AndroidTools::MavenDepsExtractor.instance.have_v4_support_lib?
-        v4jar = Dir.glob(File.join($androidsdkpath,'extras','android','**','v4','android-support-v4.jar'))
-        raise "Support-v4 library was not found neither in SDK extras nor in m2 repository" if v4jar.size !=1
-        $v4support_classpath = v4jar.first
-      end
-
 
       print_timestamp('android:extensions FINISH')
 
@@ -1435,13 +1413,23 @@ namespace "build" do
       ENV["NEON_ROOT"] = $neon_root unless $neon_root.nil?
       ENV["CONFIG_XML"] = $config_xml unless $config_xml.nil?
       ENV["RHO_DEBUG"] = $debug.to_s
-      ENV["CUSTOM_FCM_SENDER_ID"] = $app_config["android"]["fcmSenderID"] unless $app_config["android"].nil?
-      ENV["CUSTOM_FCM_APPLICATION_ID"] = $app_config["android"]["fcmAppID"] unless $app_config["android"].nil?
+      if (not $app_config["android"].nil?) and (not $app_config["android"]["fcm"].nil?)
+        ENV["FCM_MPBILESDK_APP_ID"] = $app_config["android"]["fcm"]["mobilesdk_app_id"]
+        ENV["FCM_PROJECT_NUMBER"] = $app_config["android"]["fcm"]["project_number"]
+        ENV["FCM_CURRENT_KEY"] = $app_config["android"]["fcm"]["current_key"]
+        ENV["FCM_PROJECT_ID"] = $app_config["android"]["fcm"]["project_id"]
+      end
       
-      if $app_config['android'] != nil && $app_config['android']['barcode_engine'] == "google"
-        ENV["BARCODE_ENGINE"] = 'google'
-      else
-        ENV["BARCODE_ENGINE"] = 'zxing'
+      ENV["BARCODE_ENGINE"] = 'google' #by default
+
+      unless $app_config['android']&.[]('barcode_engine').nil?
+        engine = $app_config['android']['barcode_engine']
+        case engine
+        when 'zxing'
+          ENV["BARCODE_ENGINE"] = 'zxing'
+        else
+          raise 'Only supported barcode engines are: google(default) and zxing'
+        end
       end
       
       $ext_android_build_scripts.each do |ext, builddata|
@@ -1961,16 +1949,7 @@ namespace "build" do
           args << "-L\"#{File.dirname(lib)}\""
         end
 
-        libandroid_support = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", realabi)
-        
-        if File.exists? libandroid_support
-          args << "-L\"#{libandroid_support}\""
-          args << "-landroid_support"
-          puts "libandroid_support exists"
-        end
-
-
-        
+       
         deps = []
         libs = []
 
@@ -2369,7 +2348,9 @@ namespace "build" do
       $logger.debug $appres.to_s
       $logger.debug $app_rjava_dir.to_s
 
-      if ( $rhodes_as_lib )
+      unless ($rhodes_as_lib)
+        Aapt2Helper.instance.build_resources( $build_bundle )
+      else
         mkdir_p $appres_flats
 
         #walkthrough resources dir
@@ -2416,28 +2397,17 @@ namespace "build" do
           "-R", "@" + PathToWindowsWay(flaten_list_file_path),
           "--auto-add-overlay"
         ]
+        
+        args << "--output-text-symbols"
+        args << PathToWindowsWay(File.join($app_rjava_dir, 'R.txt'))
+        args << '-v' if Rake.application.options.trace
 
-        if $rhodes_as_lib
-          args << "--output-text-symbols"
-          args << PathToWindowsWay(File.join($app_rjava_dir, 'R.txt'))
-        end
-
-      else  #no bundle and no lib so we use old AAPT
-
-        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 Rake.application.options.trace
-
-      if ($rhodes_as_lib )
         require 'nokogiri'
         
-        if($rhodes_as_lib) 
-          FormatManifestToAarCompat($appmanifest)
-        end
+        FormatManifestToAarCompat($appmanifest)
+        
         Jake.run($aapt2, args)
-        raise 'Error in AAPT: ' + $aapt2 + " " + args.join(' ') unless $?.success?
+        raise 'Error in AAPT2: ' + $aapt2 + " " + args.join(' ') unless $?.success?
 
         #how about some comments on this magic?
         if(File.exists?(File.join($app_rjava_dir, 'com', $vendor, $appname, 'R.java')))
@@ -2452,16 +2422,9 @@ namespace "build" do
         res_dirs = AndroidTools::MavenDepsExtractor.instance.aapt2_res_dirs
         res_dirs.each do |dir|
           clear_flats(dir)
-        end
-        
-      elsif ($build_bundle)
-          AabBuilder.instance.build_resources
-      else
-        Jake.run($aapt, args)
-        raise 'Error in AAPT: R.java' unless $?.success?
-      end
-
-
+        end            
+      end            
+      
       #We should've generated R.java at this point. Now let's duplicate it for our dependencies substituting package names
       packs = AndroidTools::MavenDepsExtractor.instance.extract_packages
       packs.each do |p|
@@ -2540,7 +2503,6 @@ namespace "build" do
       classpath = $androidjar
       classpath += $path_separator + $google_classpath if $google_classpath
       classpath += $path_separator + File.join($tmpdir, 'Rhodes')
-      classpath += $path_separator + $v4support_classpath if $v4support_classpath
       classpath += $path_separator + AndroidTools::MavenDepsExtractor.instance.classpath($path_separator)
 
       javalibsdir = Jake.get_absolute("platform/android/lib")
@@ -2574,7 +2536,6 @@ namespace "build" do
       classpath += $path_separator + $google_classpath if $google_classpath
       #######################################################################
 
-      classpath += $path_separator + $v4support_classpath if $v4support_classpath
       classpath += $path_separator + AndroidTools::MavenDepsExtractor.instance.classpath($path_separator)
       classpath += $path_separator + File.join($tmpdir, 'Rhodes')
       Dir.glob(File.join($app_builddir, '**', '*.jar')).each do |jar|
@@ -2615,7 +2576,6 @@ namespace "build" do
       end
 
       print_timestamp('build:android:extensions_java FINISH')
-      $android_jars << $v4support_classpath if $v4support_classpath
       $android_jars += AndroidTools::MavenDepsExtractor.instance.jars
     end
 
@@ -2816,7 +2776,7 @@ def prepare_aar_package
   args = ['cvf', 'classes.jar', '-C', '.', '.']
   jarNamesCounter = 0
   
-  $allclasses = File.join($tmpdir, 'allclasses')
+  $allclasses = File.join($tmpdir, '.allclasses')
   mkdir_p $allclasses
 
   puts "Creating classes.jar for aar package"
@@ -2899,11 +2859,11 @@ end
 def create_bundle()
   $logger.info "Creating android bundle"
 
-  builder = AabBuilder.instance
+  builder = Aapt2Helper.instance
 
-  builder.build
+  bundle = builder.build_aab
 
-  signed_bundle = File.join($targetdir,"#{$appname}-bundle-signed.aab")
+  signed_bundle = File.join($targetdir,"#{$appname}-bundle-signed.aab")  
 
   builder.debug = $debug
   if $debug
@@ -2912,7 +2872,18 @@ def create_bundle()
     builder.storepass = $storepass
     builder.storealias = $storealias
   end
-  builder.sign( signed_bundle )  
+  builder.sign_aab( bundle, signed_bundle )  
+
+  apk = File.join($targetdir,"#{$appname}-universal.apk")
+  apks = File.join($targetdir,"#{$appname}.apks")
+  Jake.run( $javabin, ["-jar", $bundletool, "build-apks","--bundle=#{signed_bundle}", "--output=#{apks}", "--mode=universal"] )
+  rm apk if File.file? apk
+  Zip::File.open(apks) { |zip|
+    e = zip.get_entry('universal.apk')
+    zip.extract(e,apk)
+  }
+
+
 end
 
 namespace "package" do
@@ -2924,17 +2895,13 @@ namespace "package" do
       next
     end
     
-    puts "Running dx utility"
-    args = []
-    args << "-Xmx1024m"
-    args << "-jar"
-    args << $dxjar
-    args << "--dex"
-    args << "--output=#{$bindir}/classes.dex"
+    $logger.info "Running DEX builder"    
 
     alljars = Dir.glob(File.join($app_builddir, '**', '*.jar'))
     alljars += AndroidTools::MavenDepsExtractor.instance.jars
 
+    jarsForDX = []
+
     require 'set'
     unique_jars = Set.new
 
@@ -2979,7 +2946,7 @@ namespace "package" do
       isFromMaven = (basename == 'classes.jar')# && Pathname.new(jar).split.include?('.m2')
       if (!unique_jars.member?(basename)) || isFromMaven
         if !useProguard
-          args << jar
+          jarsForDX << jar
         else
           jarNamesCounter += 1
           cp jar, File.join(proguardPreBuild, jarNamesCounter.to_s + '.jar')
@@ -2994,58 +2961,19 @@ namespace "package" do
       progArgs << File.join(proguardDir, 'proguard.jar')
       progArgs << '@' + proguardRules
       Jake.run(File.join($java, 'java'+$exe_ext), progArgs)
-      args << File.join(proguardPostBuild, "classes-processed.jar")
+      jarsForDX << File.join(proguardPostBuild, "classes-processed.jar")
     end
 
-    Jake.run(File.join($java, 'java'+$exe_ext), args)
-
-    unless $?.success?
-      raise "Error running DX utility"
+    unless AndroidTools::DexBuilder.instance.build( jarsForDX, "#{File.join($bindir,'classes.dex')}")
+      raise "Error running DEX builder"
     end
 
     resourcepkg = $bindir + "/rhodes.ap_"
 
-    puts "Packaging Assets and Jars"
-
-    # this task already caaled during build "build:android:all"
-    #set_app_name_android($appname)
-
-    args = ["package", "-f", "-M", $appmanifest, "-S", $appres, "-A", $appassets, "-I", $androidjar, "-F", resourcepkg]
-    args += AndroidTools::MavenDepsExtractor.instance.aapt_args
-    if $no_compression
-      $no_compression.each do |ext|
-        args << '-0'
-        args << ext
-      end
-    end
-
-    args << "--no-version-vectors"
-
-    Jake.run($aapt, args)
-    unless $?.success?
-      raise "Error running AAPT (1)"
-    end
-
-    # Workaround: manually add files starting with '_' because aapt silently ignore such files when creating package
-    args = [ Rake.application.options.trace ? "uvf" : "uf", resourcepkg]
-
-    skip_underscores = true
-
-    Dir.glob(File.join($appassets, "**/*")).each do |f|
-      next unless File.basename(f) =~ /^_/
-      relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s
-      puts "Add #{relpath} to #{resourcepkg}..."
-      args << relpath
-      skip_underscores = false
-    end
-
-    unless skip_underscores
-      Jake.run($jarbin, args, $tmpdir)
-      unless $?.success?
-        raise "Error packaging assets"
-      end
-    end
+    $logger.info "Packaging Assets and Jars"
 
+    Aapt2Helper.instance.build_intermediate_apk(resourcepkg)
+   
     puts "Packaging Native Libs"
 
     args = ["uf", resourcepkg]
@@ -3229,11 +3157,16 @@ def run_as_spec(device_flag, uninstall_app)
   AndroidTools.logclear(device_flag)
   # Start emulator with options: hidden window display and wipe user data
   AndroidTools.run_emulator(:hidden => true, :wipe => true) if device_flag == '-e'
-  do_uninstall(device_flag)
+
+  begin
+    do_uninstall(device_flag)
+  rescue Exception => e
+    puts "Uninstalling application exception: " + e.to_s
+  end
 
   # Failsafe to prevent eternal hangs
   Thread.new {
-    sleep 2000
+    sleep 10000
     if device_flag == '-e'
       #AndroidTools.kill_adb_and_emulator
       puts "%%% was AndroidTools.kill_adb_and_emulator !!!"
@@ -3484,7 +3417,7 @@ namespace "run" do
       end
 
       task :spec, :uninstall_app do |t, args|
-        Jake.decorate_spec { run_as_spec('-e', args.uninstall_app) }
+          Jake.decorate_spec { run_as_spec('-e', args.uninstall_app) }
       end
     end
 

data/platform/android/build/android_tools.rb

@@ -760,6 +760,9 @@ def read_manifest_package(path)
 end
 module_function :read_manifest_package
 
+  def self.jarbin= v
+    @@jarbin=v
+  end
 
   def self.jarsigner= v
     @@jarsigner=v
@@ -973,19 +976,16 @@ module_function :read_manifest_package
 
   def apk_build(sdk, apk_name, res_name, dex_name, debug)
     puts "Building APK file..."
-    prev_dir = Dir.pwd
-    Dir.chdir File.join(sdk, "tools")
-
-    params = ['-Xmx1024m', '-classpath', findSdkLibJar(sdk), 'com.android.sdklib.build.ApkBuilderMain', apk_name]
-
-    params += ['-u', '-z', res_name, '-f', dex_name]
+    
+    #just put dex file to a copy of already prepared intermediate APK
+    cp res_name, apk_name    
+    params = [ '-uf', apk_name, '-C', File.dirname(dex_name), File.basename(dex_name) ]
+    Jake.run( @@jarbin, params)
 
-    Jake.run File.join($java, "java#{HostPlatform.exe_ext}"), params
     unless $?.success?
-        Dir.chdir prev_dir
         raise 'Error building APK file'
     end
-    Dir.chdir prev_dir
+    
   end
   module_function :apk_build
 

data/platform/android/build/androidcommon.rb

@@ -65,7 +65,7 @@ def setup_ndk(ndkpath,apilevel,abi)
 
   $ndkgccver = ndk.gccver
   $ndk_rev_major = ndk.rev_major
-  $target_toolchain = ndk.toolchain
+  $target_toolchain = ndk.toolchain_name
   $androidndkpath = ndkpath unless $androidndkpath
 
   $sysincludes = ndk.sysincludes apilevel, abi
@@ -367,7 +367,10 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   if($ndk_rev_major >= 18)
     args << "-v"  
     args << "--target=#{$target_toolchain}#{$apilevel}"
-    args << "-fuse-ld=gold"
+
+    if($ndk_rev_major < 22)
+      args << "-fuse-ld=gold"
+    end
   end
 
   localabi = "unknown"
@@ -399,13 +402,21 @@ def cc_link(outname, objects, additional = nil, deps = nil)
   args << "-Wl,-z,defs"
   args << "-fPIC"
   args << "-Wl,-soname,#{File.basename(outname)}"
-  args << "--sysroot"
-  args << $link_sysroot
+
+  
+  if $ndk_rev_major < 22 #sysroot is auto detected by target when using NDK >= 22
+    args << "--sysroot"
+    args << $link_sysroot
+  end
+  
   args << "-o"
   args << "\"#{outname}\""
   args += objects.collect { |x| "\"#{x}\""}
   args += additional if additional.is_a? Array and not additional.empty?
-  if($ndk_rev_major >= 18)
+
+  if $ndk_rev_major>=22
+    #do nothing. clang will detect all needed linker flags by target setting
+  elsif($ndk_rev_major >= 18)
     args << "-L#{$link_sysroot}"
     args << "-Wl,-rpath-link=#{$link_sysroot}"
     args << "-L#{$link_sysroot_ext}"
@@ -464,7 +475,7 @@ def java_compile(outpath, classpath, srclist)
     args = []
     args << "-g"
     args << "-d"
-    args << outpath
+    args << "\"" + outpath + "\""
     args << "-source"
     args << "1.6"
     args << "-target"
@@ -473,7 +484,7 @@ def java_compile(outpath, classpath, srclist)
     args << "-encoding"
     args << "latin1"
     args << "-classpath"
-    args << classpath
+    args << "\"" + classpath + "\""
     args << "@#{srclist}"
     puts Jake.run(javac, args)
     unless $?.success?

data/platform/android/build/build_tools_finder.rb

@@ -0,0 +1,46 @@
+module AndroidTools
+    def findBuildToolsPath( version, sdk_path, platform)
+        if File.exist?(File.join(sdk_path, "build-tools"))
+
+            build_tools_ver = nil
+            if version
+                #will try to find user-specified build tools
+                path = File.join(sdk_path,'build-tools',version)
+                if File.directory?(path)
+                    build_tools_ver = version            
+                end
+            end
+    
+    
+            build_tools = {}
+
+            if !build_tools_ver
+                Dir.foreach(File.join(sdk_path, "build-tools")) do |entry|
+                    next if entry == '.' or entry == '..'
+
+                    #Lets read source.properties file to get highest available build-tools
+                    src_prop_path = File.join(sdk_path, "build-tools",entry,"source.properties")
+                    next unless File.file?(src_prop_path)
+
+                    File.open(src_prop_path) do |f|
+                    f.each_line do |line|
+                        build_tools[entry] = line.split('=')[1].gsub("\n",'') if line.match(/^Pkg.Revision=/)
+                    end
+                    end
+                end
+
+                latest_build_tools = build_tools.sort_by{|folder_name,sdk_version| sdk_version}.last
+                build_tools_ver = latest_build_tools[0]
+            end
+        end
+
+        if build_tools_ver
+            build_tools_path = File.join(sdk_path,'build-tools',build_tools_ver)
+        else
+            build_tools_path = File.join(sdk_path, "platforms", platform, "tools")
+        end
+
+        build_tools_path
+    end
+    module_function :findBuildToolsPath
+end