atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct android build

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-16 21:40:51 +01:00
parent 7e2cae472e
commit af24b335ac
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build

@ -1 +1 @@
Subproject commit 512651e746dfe3318308ffae94aeca731078baff Subproject commit 95b2206da682ad56fdcece7c7789f30a32a0c134

2
external/ewolsa vendored

@ -1 +1 @@
Subproject commit af355c40510498c052e9fab8b5f2ea134e752235 Subproject commit 23467923b4917aa7db24f262b3129ac5f58803c5

4
sources/ewol/context/Android/Context.cpp
View File

@ -647,7 +647,7 @@ extern "C" {
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) { JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* _jvm, void* _reserved) {
// get the java virtual machine handle ... // get the java virtual machine handle ...
std::unique_lock<std::mutex> lock(g_interfaceMutex); 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; g_JavaVM = _jvm;
EWOL_DEBUG("JNI-> load the jvm ..." ); EWOL_DEBUG("JNI-> load the jvm ..." );
return JNI_VERSION_1_6; return JNI_VERSION_1_6;
@ -655,7 +655,7 @@ extern "C" {
// JNI onUnLoad // JNI onUnLoad
JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) { JNIEXPORT void JNICALL JNI_OnUnload(JavaVM* _vm, void *_reserved) {
std::unique_lock<std::mutex> lock(g_interfaceMutex); 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; g_JavaVM = nullptr;
EWOL_DEBUG("JNI-> Un-load the jvm ..." ); EWOL_DEBUG("JNI-> Un-load the jvm ..." );
} }

15
sources/lutin_ewol.py
View File

@ -1,6 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
import lutinModule as module import lutinModule as module
import lutinTools as tools import lutinTools as tools
import lutinDebug as debug
import os import os
import lutinMultiprocess import lutinMultiprocess
@ -217,12 +218,15 @@ def create(target):
myModule.add_export_flag_LD("-ldl") myModule.add_export_flag_LD("-ldl")
myModule.add_export_flag_LD("-llog") myModule.add_export_flag_LD("-llog")
myModule.add_export_flag_LD("-landroid") 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/" cpp_tmp_dir = tools.get_current_path(__file__) + "/ewol/renderer/Android/"
java_tmp_src = java_tmp_dir + "org/ewol/EwolConstants" java_tmp_src = java_tmp_dir + "org/ewol/EwolConstants"
lutinMultiprocess.run_command("javac " + java_tmp_src + ".java") # TODO : set the build directory in out/.build with option -d ...
lutinMultiprocess.run_command("cd " + java_tmp_dir + " && javah org.ewol.EwolConstants") debugCommand = ""
tools.copy_file(java_tmp_dir + "org_ewol_EwolConstants.h", cpp_tmp_dir + "org_ewol_EwolConstants.h", force=True) 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") tools.remove_file(java_tmp_src + ".class")
elif target.name=="Windows": elif target.name=="Windows":
myModule.add_module_depend("glew") myModule.add_module_depend("glew")
@ -240,7 +244,6 @@ def create(target):
"-framework GLKit", "-framework GLKit",
"-framework Foundation", "-framework Foundation",
"-framework QuartzCore"]) "-framework QuartzCore"])
# add the currrent module at the
return myModule return myModule