rhodes 7.4.1 → 7.6.0

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
@@ -909,7 +912,7 @@ module_function :read_manifest_package
   def generateKeystore( keystore, storealias, storepass, keypass )
     @@logger.info "Generating private keystore..."
     
-    mkdir_p File.dirname($keystore) unless File.directory? File.dirname($keystore)
+    mkdir_p File.dirname(keystore) unless File.directory? File.dirname(keystore)
 
     args = []
     args << "-genkey"
@@ -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
@@ -153,18 +153,24 @@ def cpp_def_args
       args << "-std=c++11"
     else
       args << "-stdlib=libc++"
+      #args << "-std=c++17"
     end
 
     args << "-Wno-reorder"
-    #args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','stlport','stlport')}\""
-    args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include')}\""
-    args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include','backward')}\""
+
+    if($ndk_rev_major < 18)
+      args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include')}\""
+      args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include','backward')}\""
     
-    dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi','include')
-    if !File.directory?(dirArmeabi)
-      dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi-v7a','include')
+      dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi','include')
+      if !File.directory?(dirArmeabi)
+         dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi-v7a','include')
+      end
+      args << "-I\"#{dirArmeabi}\""
+    else
+      #args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','llvm-libc++','include')}\""
     end
-    args << "-I\"#{dirArmeabi}\""
+
     args
 end
 
@@ -367,7 +373,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 +408,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 +481,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 +490,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

data/platform/android/build/config.yml

@@ -0,0 +1,8 @@
+maven_deps:  
+  - 'androidx.core:core:1.6.0'
+  - 'androidx.core:core-ktx:1.6.0'
+  - 'androidx.lifecycle:lifecycle-common:2.3.1'
+  - 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+  - 'org.conscrypt:conscrypt-android:2.5.1'
+  - 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'
+  - 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

data/platform/android/build/dex_builder.rb

@@ -0,0 +1,88 @@
+require_relative '../../../lib/build/jake.rb'
+require_relative 'hostplatform.rb'
+require 'singleton'
+
+module AndroidTools
+
+    class DexBuilder
+      include Singleton
+
+      attr_accessor :logger, :sdk_path, :build_tools_path, :androidplatform, :javabin
+
+      def build( jarlist = [], outdex )
+        tools_path = detect_tools_path
+
+        bin,args = build_cmd_line(tools_path, jarlist, outdex)
+
+        @logger.debug "BIN: #{bin}, ARGS: #{args}"
+        return false unless bin
+
+        Jake.run(bin,args)
+        $?.success?
+      end
+
+      def detect_tools_path
+        
+        if (@build_tools_path)
+            path = @build_tools_path
+        else
+            path_guess_1 = File.join(@sdk_path, "platforms", @androidplatform, "tools")
+            if (File.directory?(path_guess_1))
+                path = path_guess_1                
+            else
+                path_guess_2 = File.join(@sdk_path, "platform-tools")
+                if (File.directory?(path_guess_2))
+                    path = path_guess_2
+                end
+            end
+
+        end
+
+        path
+      end
+
+        def build_cmd_line(tools_path, jarlist, outdex)
+
+            @logger.error( "DEX builder: path to build tools not set" ) unless @build_tools_path
+
+            @logger.info( "DEX builder: looking for DEX tool in #{@build_tools_path}")
+
+            #try to find dx.jar first
+            dexjar = File.join(@build_tools_path,"lib","dx.jar")
+            if File.file?(dexjar)
+
+                @logger.info( "DEX builder: found dx.jar")
+
+                args = []
+                args << "-Xmx1024m"
+                args << "-jar"
+                args << dexjar
+                args << "--dex"
+                args << "--output=#{outdex}"
+                args.concat jarlist
+
+                return @javabin, args
+                
+            else #then go for d8
+                d8 = File.join(@build_tools_path,"d8"+HostPlatform::bat_ext)                
+                if File.file?(d8)
+                    @logger.info( "DEX builder: found d8")
+
+                    raise "I'm expecting to have output dex named classes.dex for d8 tool but found #{File.basename(outdex)}" if (File.basename(outdex) != 'classes.dex')
+                    
+                    args = []
+                    args << '--output'
+                    args << "#{File.dirname(outdex)}"
+                    #args << '--no-desugaring'
+                    args.concat jarlist
+
+                    return d8, args
+                else
+                    @logger.error( "Can't find proper DEX builder in the build tools")
+                end
+
+                return nil,nil
+            end
+        end
+    end
+end

data/platform/android/build/hostplatform.rb

@@ -23,6 +23,15 @@ module HostPlatform
 	end
 	module_function :exe_ext
 
+	def bat_ext
+		if HostPlatform.windows?
+			'.bat'
+		else
+			''
+		end
+	end
+	module_function :bat_ext
+
 	def num_cpus
 		num = nil
 	 	if HostPlatform.linux?

data/platform/android/build/manifest_generator.rb

@@ -23,11 +23,11 @@ class ManifestGenerator
   attr_accessor :buildToolsVer
   attr_accessor :androidVerMaj
   attr_accessor :androidVerMin
-  
+
   attr_accessor :manifestManifestAdds
   attr_accessor :applicationManifestAdds
-  
-  def initialize(javaPackage, appPackage, hidden, permissions, features = {})
+
+  def initialize(javaPackage, appPackage, hidden, home_app, permissions, features = {})
     @javaPackageName = javaPackage
     @appPackageName = appPackage
     @permissions = {}
@@ -41,7 +41,11 @@ class ManifestGenerator
     @rhodesActivityIntentFilters = []
     @rhodesActivityIntentFilters << {:act=>'android.intent.action.VIEW', :cat=>['android.intent.category.DEFAULT', 'android.intent.category.BROWSABLE']}
     unless hidden
-      @rhodesActivityIntentFilters << {:act=>'android.intent.action.MAIN', :cat=>['android.intent.category.DEFAULT', 'android.intent.category.LAUNCHER']}
+      categors = ['android.intent.category.DEFAULT','android.intent.category.LAUNCHER']
+      if home_app
+          categors << 'android.intent.category.HOME'
+      end
+      @rhodesActivityIntentFilters << {:act=>'android.intent.action.MAIN', :cat=>categors}
     end
     @screenOrientation = 'unspecified'
     @debuggable = 'false'
@@ -51,20 +55,21 @@ class ManifestGenerator
     @applicationManifestAdds = []
     @apikey = ''
   end
-  
+
   def addGoogleMaps
     @usesLibraries['com.google.android.maps'] = true 
+    @usesLibraries['org.apache.http.legacy'] = false 
   end
-  
+
   def addGooglePush(erbPath)
     @permissions["#{@appPackageName}.permission.C2D_MESSAGE"] = 'signature'
     @usesPermissions << "#{@appPackageName}.permission.C2D_MESSAGE"
     @usesPermissions << 'com.google.android.c2dm.permission.RECEIVE'
     @applicationManifestAdds << erbPath
   end
-    
-  
-  
+
+
+
   def addUriParams(scheme, host, pathPrefix = nil)
     @rhodesActivityIntentFilters.each do |filter|
       if filter[:act] == 'android.intent.action.VIEW' && filter[:cat] == ['android.intent.category.DEFAULT', 'android.intent.category.BROWSABLE']
@@ -75,7 +80,7 @@ class ManifestGenerator
       end
     end
   end
-  
+
   def makeIntentFilter(filterHash)
     filter = REXML::Element.new 'intent-filter'
     filter.add_element('action', 'android:name'=>filterHash[:act]) if filterHash[:act]

data/platform/android/build/maven_deps_extractor.rb

@@ -25,6 +25,8 @@ class MavenDepsExtractor
     @file_deps = []
 
     @rhoroot = File.join( File.dirname(__FILE__),'..','..','..')
+
+    #@m2home = ENV["APPVEYOR_BUILD_WORKER_IMAGE"].nil? ? File.join( @rhoroot, 'res', 'build-tools', 'maven' ) : File.join('C:','PROGRA~2','Apache','Maven')
     @m2home = File.join( @rhoroot, 'res', 'build-tools', 'maven' )
     @mvnbin = File.join( @m2home, 'bin', 'mvn' )
 
@@ -45,8 +47,7 @@ class MavenDepsExtractor
     @asset_dirs = []
     @jni_libs = []
     @manifests = []
-
-    @have_v4_support_lib = false
+    @prefab_dirs = []
 
   end
 
@@ -117,6 +118,10 @@ class MavenDepsExtractor
     @dependencies
   end
 
+  def prefab_dirs
+    @prefab_dirs
+  end
+
   def set_temp_dir( d )
     raise "Maven extractor directory was already set to #{@temp_dir}" if @temp_dir
 
@@ -159,7 +164,6 @@ class MavenDepsExtractor
 
     Dir[File.join(src,'*')].each do |f|
 
-      @have_v4_support_lib = true if ( File.basename(f) =~ /support-v4/ )
 
       if File.extname(f) == '.aar'        
         target = File.join(dst,File.basename(f,'.aar'))
@@ -177,6 +181,7 @@ class MavenDepsExtractor
           libs = File.join(target,'libs')
           jni = File.join(target,'jni')
           classes = File.join(target,'classes.jar')
+          prefab = File.join(target,'prefab')
 
           @asset_dirs << assets if (File.directory?(assets) and !Dir[File.join(assets,'*')].empty? )
           @manifests << manifest if File.file?(manifest) and File.size?(r_txt)
@@ -184,6 +189,7 @@ class MavenDepsExtractor
           @jars += Dir[File.join(libs,'*.jar')]
           @jars << classes if File.file?(classes)
           @jni_libs += Dir[(File.join(jni,'**','*.so'))]
+          @prefab_dirs << prefab if (File.directory?(prefab) and !Dir[File.join(prefab,'**')].empty? )
 
         end
       elsif File.extname(f) == '.jar'
@@ -204,9 +210,9 @@ class MavenDepsExtractor
   def dep_copy_cmd
     argv = []
     argv << @mvnbin
-    argv << 'dependency:copy-dependencies'
+    argv << '"dependency:copy-dependencies"'
 #    argv << '-o' #work offline
-    argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
+    argv << "\"-Dmaven.repo.local=#{File.join(@m2home,'m2')}\""
     argv << '-e' if Rake.application.options.trace
     argv << '-X' if Rake.application.options.trace
   
@@ -236,21 +242,24 @@ class MavenDepsExtractor
 
   def dep_get_cmd(grp_id, art_id, ver, repos)
     argv = []
-    argv << @mvnbin
-    argv << 'dependency:get'
-    argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
-
-    argv << "-DgroupId=#{grp_id}"
-    argv << "-DartifactId=#{art_id}"
-    argv << "-Dversion=#{ver}"
-    argv << "-DremoteRepositories=#{repos}"
-    argv << "-Dpackaging=pom"
-    argv << "-Ddest=./"
-    argv << "-Dtransitive=false"
-
+    argv << "\"" + @mvnbin + "\""
+    argv << '"dependency:get"'
+    argv << "\"-Dmaven.repo.local=#{File.join(@m2home,'m2')}\""
+
+    argv << "\"-DgroupId=#{grp_id}\""
+    argv << "\"-DartifactId=#{art_id}\""
+    argv << "\"-Dversion=#{ver}\""
+    argv << "\"-DremoteRepositories=#{repos}\""
+    argv << "\"-Dpackaging=pom\""
+    argv << "\"-Ddest=./\""
+    argv << "\"-Dtransitive=false\""
+
+    argv << '-B'
+    argv << '-q'
     argv << '-e' if Rake.application.options.trace
     argv << '-X' if Rake.application.options.trace
 
+
     argv.join(' ')
   end
 
@@ -267,9 +276,10 @@ class MavenDepsExtractor
     Jake.run3( cmd, pwd, env )
     rm pom
 
+    target = File.join(path,'target')
     @logger.debug "Moving extracted dependencies to #{path}"
-    Dir[File.join(path,'target','dependency','*')].each { |f| mv(f,path) }
-    rm_r File.join(path,'target')
+    Dir[File.join(target,'dependency','*')].each { |f| mv(f,path) }
+    rm_r File.join(target) if File.directory?(target)
   end
 
   def split_dependency( dep )
@@ -377,9 +387,6 @@ class MavenDepsExtractor
     @jars.join(separator)
   end
 
-  def have_v4_support_lib?
-    @have_v4_support_lib
-  end
 
 end