contrib/mnit_test: compile 2 versions of mnit_simple for Android

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/mnit_test/Makefile b/contrib/mnit_test/Makefile
index 01189c9..73ed663 100644 (file)
--- a/contrib/mnit_test/Makefile
+++ b/contrib/mnit_test/Makefile
@@ -6,7 +6,8 @@ linux:
 
 android:
        mkdir -p bin
-       ../../bin/nitc -o bin/simple.apk src/complete_simple_android.nit
+       ../../bin/nitc -o bin/complete.apk src/complete_simple_android.nit --semi-global
+       ../../bin/nitc -o bin/minimal.apk src/simple_android.nit --semi-global
 
 clean:
        rm -rf bin

diff --git a/contrib/mnit_test/src/complete_simple_android.nit b/contrib/mnit_test/src/complete_simple_android.nit
index 68f3a85..b2d9975 100644 (file)
--- a/contrib/mnit_test/src/complete_simple_android.nit
+++ b/contrib/mnit_test/src/complete_simple_android.nit
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Entrypoint of an app with all the mnit tests for Android
 module complete_simple_android is
+       app_name "mnit Complete"
        app_namespace "org.nitlanguage.test_all"
        android_api_target 19
 end

diff --git a/contrib/mnit_test/src/simple.nit b/contrib/mnit_test/src/simple.nit
index b89f8af..07dd3a3 100644 (file)
--- a/contrib/mnit_test/src/simple.nit
+++ b/contrib/mnit_test/src/simple.nit
@@ -16,7 +16,7 @@
 
 # Very simple application
 module simple is
-       app_name("mnit Simple example") # On Android, this name is hidden by the value in `res/values/strings.xml`
+       app_name "mnit Minimal"
        app_version(0, 2, git_revision)
 end
 

diff --git a/contrib/mnit_test/src/simple_android.nit b/contrib/mnit_test/src/simple_android.nit
index 2ef2f3c..bc5e69d 100644 (file)
--- a/contrib/mnit_test/src/simple_android.nit
+++ b/contrib/mnit_test/src/simple_android.nit
@@ -15,7 +15,8 @@
 # limitations under the License.
 
 module simple_android is
-       android_manifest("""<uses-permission android:name="android.permission.VIBRATE" />""")
+       app_namespace "org.nitlanguage.test_minimal"
+       android_manifest """<uses-permission android:name="android.permission.VIBRATE" />"""
 end
 
 import mnit_android