admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabled building for Android again with NDK 25.0.

Browse Source
This commit is contained in:
SAkira a.k.a. Akira Suzuki
2022-08-02 20:33:56 +09:00
parent 441c6ea30d
commit 4610fa55b9
4 changed files with 36 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_config/android_arm64_v8a.rb
+1 -1
View File
@@ -2,7 +2,7 @@
MRuby::CrossBuild.new('android-arm64-v8a') do |conf|
params = {
:arch => 'arm64-v8a',
:platform => 'android-24',
:sdk_version => 26,
:toolchain => :clang,
}
toolchain :android, params
build_config/android_armeabi.rb
+1 -1
View File
@@ -2,7 +2,7 @@
MRuby::CrossBuild.new('android-armeabi') do |conf|
params = {
:arch => 'armeabi',
:platform => 'android-24',
:sdk_version => 26,
:toolchain => :clang,
}
toolchain :android, params
build_config/android_armeabi_v7a_neon_hard.rb
+1 -1
View File
@@ -4,7 +4,7 @@ MRuby::CrossBuild.new('android-armeabi-v7a-neon-hard') do |conf|
:arch => 'armeabi-v7a',
:mfpu => 'neon',
:mfloat_abi => 'hard',
:platform => 'android-24',
:sdk_version => 26,
:toolchain => :clang,
}
toolchain :android, params
tasks/toolchains/android.rake
+33 -88
View File
@@ -1,9 +1,11 @@
require "json"
class MRuby::Toolchain::Android
DEFAULT_ARCH = 'armeabi' # TODO : Revise if arch should have a default
DEFAULT_TOOLCHAIN = :clang
DEFAULT_NDK_HOMES = %w{
/usr/local/opt/android-sdk/ndk-bundle
/usr/local/opt/android-ndk
@@ -32,28 +34,6 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
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
class SysrootNotReady < StandardError
def message
<<-EOM
Couldn't find standard header files
Please Move/Copy important file inside
<NDK_HOME>/sysroot/usr/include/
to
<NDK_HOME>/platforms/<ANDROID_VERSION>/<ARCH>/usr/include/
Higher NDK version will be use.
EOM
end
end
attr_reader :params
def initialize(params)
@@ -178,54 +158,6 @@ Higher NDK version will be use.
@arch ||= (params[:arch] || ENV['ANDROID_ARCH'] || DEFAULT_ARCH).to_s
end
def sysroot
return @sysroot if @sysroot
sysroot_path = home_path.join('platforms', platform,
case arch
when /armeabi/ then 'arch-arm'
when /arm64-v8a/ then 'arch-arm64'
when /x86_64/ then 'arch-x86_64'
when /x86/ then 'arch-x86'
when /mips64/ then 'arch-mips64'
when /mips/ then 'arch-mips'
end
).to_s
if Dir.exist?(File.join(sysroot_path, "usr", "include"))
return @sysroot = sysroot_path
else
raise(SysrootNotReady)
end
end
def platform
if @platform === nil then
@platform = params[:platform] || ENV['ANDROID_PLATFORM'] || nil
if @platform === nil
Dir.glob(home_path.join('platforms/android-*').to_s){ |item|
next if File.file?(item)
if @platform === nil
@platform = Integer(item.rpartition('-')[2])
else
platform = Integer(item.rpartition('-')[2])
@platform = platform > @platform ? platform : @platform
end
}
if @platform === nil
raise(PlatformDirNotFound)
else
@platform = "android-#{@platform}"
end
end
end
if Integer(@platform.rpartition('-')[2]) < 21
case arch
when /arm64-v8a/, /x86_64/, /mips64/
raise NotImplementedError, "Platform (#{@platform}) has no implementation for architecture (#{arch})"
end
end
@platform
end
def armeabi_v7a_mfpu
@armeabi_v7a_mfpu ||= (params[:mfpu] || 'vfpv3-d16').to_s
end
@@ -234,6 +166,19 @@ Higher NDK version will be use.
@armeabi_v7a_mfloat_abi ||= (params[:mfloat_abi] || 'softfp').to_s
end
def sdk_version
@sdk_version ||= params[:sdk_version]
if !@sdk_version then
# Higher SDK version will be used.
json = nil
File.open(home_path + "meta/platforms.json") do |f|
json = JSON.load(f)
end
@sdk_version = json["max"]
end
@sdk_version
end
def no_warn_mismatch
if %W(soft softfp).include? armeabi_v7a_mfloat_abi
''
@@ -259,6 +204,7 @@ Higher NDK version will be use.
def ctarget
flags = []
v = sdk_version
case toolchain
when :gcc
case arch
@@ -272,13 +218,13 @@ Higher NDK version will be use.
end
when :clang
case arch
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi)
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
when /x86/ then flags += %W(-target i686-none-linux-android)
when /mips64/ then flags += %W(-target mips64el-none-linux-android)
when /mips/ then flags += %W(-target mipsel-none-linux-android)
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v})
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
when /x86/ then flags += %W(-target i686-none-linux-android#{v})
when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
end
end
@@ -304,7 +250,7 @@ Higher NDK version will be use.
flags += %W(-U_WIN32 -U_WIN64)
end
flags += %W(-MMD -MP -D__android__ -DANDROID --sysroot="#{sysroot}")
flags += %W(-MMD -MP -D__android__ -DANDROID)
flags += ctarget
case toolchain
when :gcc
@@ -319,14 +265,13 @@ Higher NDK version will be use.
def ldflags
flags = []
flags += %W(--sysroot="#{sysroot}")
flags
end
def ldflags_before_libraries
flags = []
v = sdk_version
case toolchain
when :gcc
case arch
@@ -335,13 +280,13 @@ Higher NDK version will be use.
when :clang
flags += %W(-gcc-toolchain "#{gcc_toolchain_path.to_s}")
case arch
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi -Wl,--fix-cortex-a8#{no_warn_mismatch})
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi)
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android)
when /x86_64/ then flags += %W(-target x86_64-none-linux-android)
when /x86/ then flags += %W(-target i686-none-linux-android)
when /mips64/ then flags += %W(-target mips64el-none-linux-android)
when /mips/ then flags += %W(-target mipsel-none-linux-android)
when /armeabi-v7a/ then flags += %W(-target armv7-none-linux-androideabi#{v} -Wl,--fix-cortex-a8#{no_warn_mismatch})
when /armeabi/ then flags += %W(-target armv5te-none-linux-androideabi#{v})
when /arm64-v8a/ then flags += %W(-target aarch64-none-linux-android#{v})
when /x86_64/ then flags += %W(-target x86_64-none-linux-android#{v})
when /x86/ then flags += %W(-target i686-none-linux-android#{v})
when /mips64/ then flags += %W(-target mips64el-none-linux-android#{v})
when /mips/ then flags += %W(-target mipsel-none-linux-android#{v})
end
end
flags += %W(-no-canonical-prefixes)