diff --git a/build b/build
index 512651e7..95b2206d 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 512651e746dfe3318308ffae94aeca731078baff
+Subproject commit 95b2206da682ad56fdcece7c7789f30a32a0c134
diff --git a/external/ewolsa b/external/ewolsa
index af355c40..23467923 160000
--- a/external/ewolsa
+++ b/external/ewolsa
@@ -1 +1 @@
-Subproject commit af355c40510498c052e9fab8b5f2ea134e752235
+Subproject commit 23467923b4917aa7db24f262b3129ac5f58803c5
diff --git a/sources/ewol/context/Android/Context.cpp b/sources/ewol/context/Android/Context.cpp
index 4f5c2225..c105078a 100644
--- a/sources/ewol/context/Android/Context.cpp
+++ b/sources/ewol/context/Android/Context.cpp
@@ -647,7 +647,7 @@ extern "C" {
 	JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) {
 		// get the java virtual machine handle ...
 		std::unique_lock<std::mutex> lock(g_interfaceMutex);
-		std::unique_lock<std::mutex> lock(g_interfaceAudioMutex);
+		std::unique_lock<std::mutex> lockAudio(g_interfaceAudioMutex);
 		g_JavaVM = _jvm;
 		EWOL_DEBUG("JNI-> load the jvm ..." );
 		return JNI_VERSION_1_6;
@@ -655,7 +655,7 @@ extern "C" {
 	// JNI onUnLoad
 	JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) {
 		std::unique_lock<std::mutex> lock(g_interfaceMutex);
-		std::unique_lock<std::mutex> lock(g_interfaceAudioMutex);
+		std::unique_lock<std::mutex> lockAudio(g_interfaceAudioMutex);
 		g_JavaVM = nullptr;
 		EWOL_DEBUG("JNI-> Un-load the jvm ..." );
 	}
diff --git a/sources/lutin_ewol.py b/sources/lutin_ewol.py
index 3ebba77a..2c7dafd8 100755
--- a/sources/lutin_ewol.py
+++ b/sources/lutin_ewol.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 import lutinModule as module
 import lutinTools as tools
+import lutinDebug as debug
 import os
 import lutinMultiprocess
 
@@ -217,12 +218,15 @@ def create(target):
 		myModule.add_export_flag_LD("-ldl")
 		myModule.add_export_flag_LD("-llog")
 		myModule.add_export_flag_LD("-landroid")
-		java_tmp_dir = tools.get_current_path(__file__) + "/../../ewol/sources/android/src/"
+		java_tmp_dir = tools.get_current_path(__file__) + "/../sources/android/src/"
 		cpp_tmp_dir = tools.get_current_path(__file__) + "/ewol/renderer/Android/"
 		java_tmp_src = java_tmp_dir + "org/ewol/EwolConstants"
-		lutinMultiprocess.run_command("javac " + java_tmp_src + ".java")
-		lutinMultiprocess.run_command("cd " + java_tmp_dir + " && javah org.ewol.EwolConstants")
-		tools.copy_file(java_tmp_dir + "org_ewol_EwolConstants.h", cpp_tmp_dir + "org_ewol_EwolConstants.h", force=True)
+		# TODO : set the build directory in out/.build with option -d ...
+		debugCommand = ""
+		if debug.get_level() >= 4:
+			debugCommand = " -verbose "
+		lutinMultiprocess.run_command("javac " + debugCommand + java_tmp_src + ".java")
+		lutinMultiprocess.run_command("javah " + debugCommand + "-classpath " + java_tmp_dir + " -d " + cpp_tmp_dir + " org.ewol.EwolConstants")
 		tools.remove_file(java_tmp_src + ".class")
 	elif target.name=="Windows":
 		myModule.add_module_depend("glew")
@@ -240,7 +244,6 @@ def create(target):
 			"-framework GLKit",
 			"-framework Foundation",
 			"-framework QuartzCore"])
-
-	# add the currrent module at the 
+	
 	return myModule