Skip to content

M
mruby
Commit 07e905ef authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto Committed by GitHub
Browse files
Options

Merge pull request #3209 from AltimitSystems/master 

Re-written android.rake task for latest Android NDK clang. Currently …
parents 08a1dd2a 18662ff5
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 146 deletions
tasks/toolchains/android.rake
View file @ 07e905ef
class MRuby::Toolchain::Android class MRuby::Toolchain::Android
DEFAULT_ARCH = 'armeabi'
DEFAULT_PLATFORM = 'android-14' DEFAULT_ARCH = 'armeabi' # TODO : Revise if arch should have a default
DEFAULT_TOOLCHAIN = :gcc
DEFAULT_TOOLCHAIN = :clang
DEFAULT_NDK_HOMES = %w{ DEFAULT_NDK_HOMES = %w{
/usr/local/opt/android-ndk /usr/local/opt/android-ndk
/usr/local/opt/android-sdk/ndk-bundle
%LOCALAPPDATA%/Android/android-sdk/ndk-bundle
} }
TOOLCHAINS = [:gcc, :clang]
TOOLCHAINS = [:clang] # TODO : Add gcc support
ARCHITECTURES = %w{ ARCHITECTURES = %w{
armeabi armeabi-v7a arm64-v8a armeabi armeabi-v7a arm64-v8a
mips mips64
x86 x86_64 x86 x86_64
} } # TODO : Add mips mips64 support
class AndroidNDKHomeNotFound < StandardError class AndroidNDKHomeNotFound < StandardError
def message def message
...@@ -21,196 +26,203 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter ...@@ -21,196 +26,203 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
end end
end end
class PlatformDirNotFound < StandardError
def message
<<-EOM
Couldn't find Android NDK platform directories.
Set ANDROID_PLATFORM environment variable or set :platform parameter
EOM
end
end
attr_reader :params attr_reader :params
def initialize(params) def initialize(params)
@params = params @params = params
end end
def home_path def bin_gcc(command)
@home_path ||= Pathname( case toolchain
params[:ndk_home] || when :gcc then bin(command)
ENV['ANDROID_NDK_HOME'] || when :clang
DEFAULT_NDK_HOMES.find{ |path| File.directory?(path) } || command = command.to_s
raise(AndroidNDKHomeNotFound)
) command = case arch
when /armeabi/, /armeabi-v7a/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86/ then 'i686-linux-android-'
when /x86_64/ then 'x86_64-linux-android-'
when /mips/ then 'mipsel-linux-android-'
when /mips64/ then 'mips64el-linux-android-'
end + command
prefix = case arch
when /armeabi/, /armeabi-v7a/ then 'arm-linux-androideabi-'
when /arm64-v8a/ then 'aarch64-linux-android-'
when /x86/ then 'x86-'
when /x86_64/ then 'x86_64-'
when /mips/ then 'mipsel-linux-android-'
when /mips64/ then 'mips64el-linux-android-'
end end
def arch test = case arch
params.fetch(:arch){ DEFAULT_ARCH } when /armeabi/, /armeabi-v7a/ then 'arm-linux-androideabi-*'
when /arm64-v8a/ then 'aarch64-linux-android-*'
when /x86/ then 'x86-*'
when /x86_64/ then 'x86_64-*'
when /mips/ then 'mipsel-linux-android-*'
when /mips64/ then 'mips64el-linux-android-*'
end end
def platform gcc_toolchain_version = Dir[home_path.join('toolchains', test)].map{|t| t.match(/-(\d+\.\d+)$/); $1.to_f }.max
params.fetch(:platform){ DEFAULT_PLATFORM } gcc_toolchain_path = home_path.join('toolchains', prefix + gcc_toolchain_version.to_s, 'prebuilt', host_platform)
gcc_toolchain_path.join('bin', command).to_s
end
end end
def toolchain def bin(command)
params.fetch(:toolchain){ DEFAULT_TOOLCHAIN } command = command.to_s
toolchain_path.join('bin', command).to_s
end end
def toolchain_version def home_path
params.fetch(:toolchain_version) do @home_path ||= Pathname(
test = case toolchain params[:ndk_home] ||
when :gcc ENV['ANDROID_NDK_HOME'] ||
case arch DEFAULT_NDK_HOMES.find { |path|
when /armeabi/ path.gsub! '%LOCALAPPDATA%', ENV['LOCALAPPDATA'] || '%LOCALAPPDATA%'
'arm-linux-androideabi-*' path.gsub! '\\', '/'
when /arm64/ File.directory?(path)
'aarch64-linux-android-*' } || raise(AndroidNDKHomeNotFound)
when /mips64/ )
'mips64el-linux-android-*'
when /mips/
'mipsel-linux-android-*'
when /x86_64/
'x86_64-*'
when /x86/
'x86-*'
end end
when :clang
'llvm-*' def toolchain
@toolchain ||= params.fetch(:toolchain){ DEFAULT_TOOLCHAIN }
end end
Dir[home_path.join('toolchains',test)].map{|t| t.match(/-(\d+\.\d+)$/); $1.to_f }.max def toolchain_path
@toolchain_path ||= case toolchain
when :clang
home_path.join('toolchains', 'llvm' , 'prebuilt', host_platform)
end end
end end
def toolchain_path def host_platform
prefix = case toolchain @host_platform ||= case RUBY_PLATFORM
when :clang then 'llvm-' when /cygwin|mswin|mingw|bccwin|wince|emx/i
when :gcc path = home_path.join('toolchains', 'llvm' , 'prebuilt', 'windows*')
case arch Dir.glob(path.to_s){ |item|
when /armeabi/ then 'arm-linux-androideabi-' next if File.file?(item)
when /arm64/ then 'aarch64-linux-android-' path = Pathname(item)
when /x86_64/ then 'x86_64-' break
when /x86/ then 'x86-' }
when /mips64/ then 'mips64el-linux-android-' path.basename
when /mips/ then 'mipsel-linux-android-' when /x86_64-darwin/i
'darwin-x86_64'
when /darwin/i
'darwin-x86'
when /x86_64-linux/i
'linux-x86_64'
when /linux/i
'linux-x86'
else
raise NotImplementedError, "Unknown host platform (#{RUBY_PLATFORM})"
end end
end end
home_path.join('toolchains', prefix + toolchain_version.to_s, 'prebuilt', host_platform)
def arch
@arch ||= (params[:arch] || ENV['ANDROID_ARCH'] || DEFAULT_ARCH).to_s
end end
def sysroot def sysroot
path = case arch @sysroot ||= home_path.join('platforms', platform,
when /armeabi/ then 'arch-arm' case arch
when /arm64/ then 'arch-arm64' when /armeabi/, /armeabi-v7a/ then 'arch-arm'
when /x86_64/ then 'arch-x86_64' when /arm64-v8a/ then 'arch-arm64'
when /x86/ then 'arch-x86' when /x86/ then 'arch-x86'
when /mips64/ then 'arch-mips64' when /x86_64/ then 'arch-x86_64'
when /mips/ then 'arch-mips' when /mips/ then 'arch-mips'
when /mips64/ then 'arch-mips64'
end end
).to_s
home_path.join('platforms', platform, path).to_s
end end
def bin(command) def platform
command = command.to_s if @platform === nil then
@platform = params[:platform] || ENV['ANDROID_PLATFORM'] || nil
if toolchain == :gcc if @platform === nil
command = case arch Dir.glob(home_path.join('platforms/android-*').to_s){ |item|
when /armeabi/ then 'arm-linux-androideabi-' next if File.file?(item)
when /arm64/ then 'aarch64-linux-android-' if @platform === nil
when /x86_64/ then 'x86_64-linux-android-' @platform = Integer(item.rpartition('-')[2])
when /x86/ then 'i686-linux-android-' else
when /mips64/ then 'mips64el-linux-android-' platform = Integer(item.rpartition('-')[2])
when /mips/ then 'mipsel-linux-android-' @platform = platform > @platform ? platform : @platform
end + command
end end
}
toolchain_path.join('bin',command).to_s if @platform === nil
raise(PlatformDirNotFound)
else
@platform = "android-#{@platform}"
end end
def cc
case toolchain
when :gcc then bin(:gcc)
when :clang then bin(:clang)
end end
end end
if Integer(@platform.rpartition('-')[2]) < 21
def cflags
flags = []
case toolchain
when :gcc
flags += %W(-ffunction-sections -funwind-tables -no-canonical-prefixes)
flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}")
case arch case arch
when /arm64/ when /arm64-v8a/, /x86_64/, /mips64/
flags += %W(-fpic -fstack-protector-strong) raise NotImplementedError, "Platform (#{@platform}) has no implementation for architecture (#{arch})"
when 'armeabi-v7a-hard'
flags += %W(-fpic -fstack-protector-strong -march=armv7-a -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -mfpu=vfpv3-d16)
when 'armeabi-v7a'
flags += %W(-fpic -fstack-protector-strong -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16)
when /arm/
flags += %W(-fpic -fstack-protector-strong -march=armv5te -mtune=xscale -msoft-float)
when /mips/
flags += %W(-fpic -fno-strict-aliasing -finline-functions -fmessage-length=0 -fno-inline-functions-called-once -fgcse-after-reload -frerun-cse-after-loop -frename-registers)
when /x86/
flags += %W(-fstack-protector-strong)
end end
when :clang
end end
@platform
flags
end end
def ld def cc
cc case toolchain
when :clang then bin('clang')
end
end end
def ldflags def ar
flags = []
case toolchain case toolchain
when :gcc when :clang then bin_gcc('ar')
flags += %W(-no-canonical-prefixes)
flags += %W(-D__android__ -mandroid --sysroot="#{sysroot}")
case arch
when 'armeabi-v7a-hard'
flags += %W(-march=armv7-a -Wl,--fix-cortex-a8 -Wl,--no-warn-mismatch -lm_hard)
when 'armeabi-v7a'
flags += %W(-march=armv7-a -Wl,--fix-cortex-a8)
end end
end end
flags def cflags
end flags = []
def ar flags += %W(-D__android__ --sysroot="#{sysroot}")
case toolchain case toolchain
when :gcc then bin(:ar) when :clang
when :clang then bin('llvm-ar') flags += %W(-gcc-toolchain #{toolchain_path.to_s})
case arch
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi)
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
when /x86/ then flags += %W(-target i686-none-linux-android)
when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
when /mips/ then flags += %W(-target mipsel-none-linux-android)
when /mips64/ then flags += %W(-target mips64el-none-linux-android)
end end
end end
def host_platform flags
case RUBY_PLATFORM
when /cygwin|mswin|mingw|bccwin|wince|emx/i
'windows'
when /x86_64-darwin/i
'darwin-x86_64'
when /darwin/i
'darwin-x86'
when /x86_64-linux/i
'linux-x86_64'
when /linux/i
'linux-x86'
else
raise NotImplementedError, "Unknown host platform (#{RUBY_PLATFORM})"
end
end end
end end
MRuby::Toolchain.new(:android) do |conf, params| MRuby::Toolchain.new(:android) do |conf, params|
ndk = MRuby::Toolchain::Android.new(params) android = MRuby::Toolchain::Android.new(params)
toolchain ndk.toolchain toolchain android.toolchain
[conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc| [conf.cc, conf.cxx, conf.objc, conf.asm].each do |cc|
cc.command = ndk.cc cc.command = android.cc
cc.flags = ndk.cflags cc.flags = android.cflags
end end
conf.linker.command = ndk.ld
conf.linker.flags = ndk.ldflags
conf.archiver.command = ndk.ar
end
conf.archiver.command = android.ar
conf.linker.command = android.cc
conf.linker.flags = []
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment