lib/app: provide conditional importation of app extensions

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/lib/android/android.nit b/lib/android/android.nit
index a92ed8d..f083dd9 100644 (file)
--- a/lib/android/android.nit
+++ b/lib/android/android.nit
@@ -24,7 +24,6 @@ import platform
 import native_app_glue
 import dalvik
 private import log
-private import data_store
 
 redef class App
        redef fun init_window

diff --git a/lib/app/audio.nit b/lib/app/audio.nit
index 1b5eff4..51c0c12 100644 (file)
--- a/lib/app/audio.nit
+++ b/lib/app/audio.nit
@@ -24,6 +24,11 @@ module audio
 import app_base
 import standard::error
 
+# Platform variations
+# TODO: move on the platform once qualified names are understand in the condition
+import linux::audio is conditional(linux)
+import android::audio is conditional(android)
+
 # Abstraction of a playable Audio
 abstract class PlayableAudio
 

diff --git a/lib/app/data_store.nit b/lib/app/data_store.nit
index 13891fc..5c59036 100644 (file)
--- a/lib/app/data_store.nit
+++ b/lib/app/data_store.nit
@@ -22,6 +22,11 @@ module data_store
 import app_base
 import serialization
 
+# Platform variations
+# TODO: move on the platform once qualified names are understand in the condition
+import linux::data_store is conditional(linux)
+import android::data_store is conditional(android)
+
 redef class App
        # Services to store and load data
        fun data_store: DataStore is abstract

diff --git a/lib/app/ui.nit b/lib/app/ui.nit
index 2e30c76..3006a47 100644 (file)
--- a/lib/app/ui.nit
+++ b/lib/app/ui.nit
@@ -17,6 +17,11 @@ module ui
 
 import app_base
 
+# Platform variations
+# TODO: move on the platform once qualified names are understand in the condition
+import linux::ui is conditional(linux)
+import android::ui is conditional(android)
+
 redef class App
        super AppComponent
 

diff --git a/lib/linux/linux.nit b/lib/linux/linux.nit
index 2fecee8..8b90102 100644 (file)
--- a/lib/linux/linux.nit
+++ b/lib/linux/linux.nit
@@ -18,4 +18,3 @@
 module linux
 
 import app
-private import data_store