summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-10-13 08:28:10 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-10-13 08:28:10 +0900
commit089e2a16771f1c60b5ec33564a490139279d0629 (patch)
treed983a72a5e781e3a4b2e3230ce8cd2c9751bfccc
parente48596e9e69a17f6a8b8460dbb12d0084ed2ff27 (diff)
parent1e2381f870ad18b08a6759d6f627b5260085927e (diff)
downloadmruby-089e2a16771f1c60b5ec33564a490139279d0629.tar.gz
mruby-089e2a16771f1c60b5ec33564a490139279d0629.zip
Merge pull request #2991 from sagmor/android-rename
Rename androidndk tolchain to just android
-rw-r--r--tasks/toolchains/android.rake (renamed from tasks/toolchains/androidndk.rake)7
1 files changed, 3 insertions, 4 deletions
diff --git a/tasks/toolchains/androidndk.rake b/tasks/toolchains/android.rake
index ccf1a0c4d..63c384fd8 100644
--- a/tasks/toolchains/androidndk.rake
+++ b/tasks/toolchains/android.rake
@@ -1,5 +1,4 @@
-
-class MRuby::Toolchain::AndroidNDK
+class MRuby::Toolchain::Android
DEFAULT_ARCH = 'armeabi'
DEFAULT_PLATFORM = 'android-14'
DEFAULT_TOOLCHAIN = :gcc
@@ -199,8 +198,8 @@ Set ANDROID_NDK_HOME environment variable or set :ndk_home parameter
end
end
-MRuby::Toolchain.new(:androidndk) do |conf, params|
- ndk = MRuby::Toolchain::AndroidNDK.new(params)
+MRuby::Toolchain.new(:android) do |conf, params|
+ ndk = MRuby::Toolchain::Android.new(params)
toolchain ndk.toolchain