do
var android_project_root = android_project_root.as(not null)
var project = toolcontext.modelbuilder.android_project_for(compiler.mainmodule)
- var short_project_name = compiler.mainmodule.name
+ var short_project_name = compiler.mainmodule.name.replace("-", "_")
var release = toolcontext.opt_release.value
var app_name = project.name
if app_name == null then app_name = compiler.mainmodule.name
+ if not release then app_name += " Debug"
var app_package = project.java_package
if app_package == null then app_package = "org.nitlanguage.{short_project_name}"
+ if not release then app_package += "_debug"
var app_version = project.version
if app_version == null then app_version = "1.0"
end
end
- ## Generate delegating makefile
+ ## Generate Application.mk
dir = "{android_project_root}/jni/"
"""
+APP_ABI := armeabi armeabi-v7a x86 mips
+APP_PLATFORM := android-{{{app_target_api}}}
+""".write_to_file "{dir}/Application.mk"
+
+ ## Generate delegating makefile
+ """
include $(call all-subdir-makefiles)
- """.write_to_file("{dir}/Android.mk")
+""".write_to_file "{dir}/Android.mk"
# Gather ldflags for Android
var ldflags = new Array[String]
LOCAL_MODULE := main
LOCAL_SRC_FILES := \\
{{{cfiles.join(" \\\n")}}}
-LOCAL_LDLIBS := {{{ldflags.join(" ")}}} libgc.a
+LOCAL_LDLIBS := {{{ldflags.join(" ")}}} $(TARGET_ARCH)/libgc.a
LOCAL_STATIC_LIBRARIES := android_native_app_glue png
include $(BUILD_SHARED_LIBRARY)
android:label="@string/app_name"
android:hasCode="true"
android:debuggable="{{{not release}}}"
- {{{icon_declaration}}}>
+ {{{icon_declaration}}}
+ android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation">
<!-- Our activity is the built-in NativeActivity framework class.
This will take care of integrating with our NDK code. -->
end
# Ensure that android-setup-libgc.sh has been executed
- if not "{share_dir}/libgc/lib".file_exists then
+ if not "{share_dir}/libgc/arm/lib".file_exists then
toolcontext.exec_and_check(["{share_dir}/libgc/android-setup-libgc.sh"], "Android project error")
end
# Copy GC files
- toolcontext.exec_and_check(["cp", "{share_dir}/libgc/lib/libgc.a", "{android_project_root}/libgc.a"], "Android project error")
- toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/include/gc/", "{android_project_root}/jni/nit_compile/gc"], "Android project error")
+ for arch in ["arm", "x86", "mips"] do
+ dir = android_project_root/arch
+ dir.mkdir
+ toolcontext.exec_and_check(["cp", "{share_dir}/libgc/{arch}/lib/libgc.a",
+ dir/"libgc.a"], "Android project error")
+ end
+
+ toolcontext.exec_and_check(["ln", "-s", "{share_dir}/libgc/arm/include/gc/",
+ "{android_project_root}/jni/nit_compile/gc"], "Android project error")
### Link to assets (for mnit and others)
# This will be accessed from `android_project_root`
"""<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">{{{app_name}}}</string>
-</resources>""".write_to_file "{dir}/res/values/strings.xml"
+</resources>""".write_to_file "{android_project_root}/res/values/strings.xml"
end
# Android libs folder
redef fun compile_c_code(compiler, compile_dir)
do
var android_project_root = android_project_root.as(not null)
+ var short_project_name = compiler.mainmodule.name.replace("-", "_")
var release = toolcontext.opt_release.value
# Compile C code (and thus Nit)
var outname = outfile(compiler.mainmodule)
if release then
- var apk_path = "{android_project_root}/bin/{compiler.mainmodule.name}-release-unsigned.apk"
+ var apk_path = "{android_project_root}/bin/{short_project_name}-release-unsigned.apk"
# Sign APK
var keystore_path= "KEYSTORE".environ
toolcontext.exec_and_check(args, "Android project error")
else
# Move to the expected output path
- args = ["mv", "{android_project_root}/bin/{compiler.mainmodule.name}-debug.apk", outname]
+ args = ["mv", "{android_project_root}/bin/{short_project_name}-debug.apk", outname]
toolcontext.exec_and_check(args, "Android project error")
end
end