contrib/jwrapper examples: android_lib extract more and support collections

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

diff --git a/contrib/jwrapper/examples/android_api/Makefile b/contrib/jwrapper/examples/android_api/Makefile
index e26ba9c..e01cb00 100644 (file)
--- a/contrib/jwrapper/examples/android_api/Makefile
+++ b/contrib/jwrapper/examples/android_api/Makefile
@@ -4,11 +4,12 @@ all: android_api.nit
 
 java_api.nit:
        mkdir -p tmp
-       ../../bin/jwrapper -v -u comment -o java_api.nit -r "^java" $(ANDROID_JAR)
+       ../../bin/jwrapper -vv -u comment -o java_api.nit -r "^(java|javax|junit|org)" $(ANDROID_JAR) -i ../../../../lib/java/collections.nit
+       echo "+ Disabled functions: `grep '#\s*fun' $@ | wc -l` / `grep '^\s*fun' $@ | wc -l`"
 
 android_api.nit: java_api.nit
-       ../../bin/jwrapper -v -u comment -o android_api.nit -r "^android" -i java_api.nit $(ANDROID_JAR)
-       echo "+ Disabled functions: `grep '#    fun' $@ | wc -l` / `grep '^     fun' $@ | wc -l`"
+       ../../bin/jwrapper -vv -u comment -o android_api.nit -r "^(android|com.android)" -i java_api.nit $(ANDROID_JAR) -i ../../../../lib/java/collections.nit
+       echo "+ Disabled functions: `grep '#\s*fun' $@ | wc -l` / `grep '^\s*fun' $@ | wc -l`"
 
        # Insert an import between the 2 modules
        sed -i -e "s/import java/import java\nimport java_api/" android_api.nit