compiler: global compiler escape the module name

[nit.git] / src / compiler / android_platform.nit

diff --git a/src/compiler/android_platform.nit b/src/compiler/android_platform.nit
index c06a374..55468fd 100644 (file)
--- a/src/compiler/android_platform.nit
+++ b/src/compiler/android_platform.nit
@@ -19,8 +19,8 @@ module android_platform
 
 import platform
 import abstract_compiler
-import common_ffi
-intrude import common_ffi::extra_java_files
+import ffi
+intrude import ffi::extra_java_files
 import android_annotations
 
 redef class ToolContext
@@ -205,8 +205,8 @@ $(call import-module,android/native_app_glue)
                # libpng is not available on Android NDK
                # FIXME make obtionnal when we have alternatives to mnit
                var nit_dir = toolcontext.nit_dir
-               var share_dir =  "{nit_dir or else ""}/share/"
-               if nit_dir == null or not share_dir.file_exists then
+               var share_dir =  nit_dir/"share/"
+               if not share_dir.file_exists then
                        print "Android project error: Nit share directory not found, please use the environment variable NIT_DIR"
                        exit 1
                end