From adc8336597def14cd87c82c295cff77f4782a808 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 29 May 2013 21:38:53 +0200 Subject: [PATCH] [DEV] correction of the android compilate and update with the new system --- lutinTargetAndroid.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/lutinTargetAndroid.py b/lutinTargetAndroid.py index d921b8b..c3fd175 100644 --- a/lutinTargetAndroid.py +++ b/lutinTargetAndroid.py @@ -104,13 +104,13 @@ class Target(lutinTarget.Target): #FINAL_FILE_ABSTRACTION self.file_finalAbstraction = self.folder_javaProject + "/" + pkgName + ".java" - lutinTools.CopyFile(self.folder_ewol + "/sources/android/PROJECT_NAME.java", self.file_finalAbstraction, True) + #lutinTools.CopyFile(self.folder_ewol + "/sources/android/PROJECT_NAME.java", self.file_finalAbstraction, True) - os.system("sed -i \"s|__PROJECT_ORG_TYPE__|"+pkgProperties["COMPAGNY_TYPE"]+"|\" " + self.file_finalAbstraction) - os.system("sed -i \"s|__PROJECT_VENDOR__|"+pkgProperties["COMPAGNY_NAME2"]+"|\" " + self.file_finalAbstraction) - os.system("sed -i \"s|__PROJECT_NAME__|" + pkgName + "|\" "+ self.file_finalAbstraction) - os.system("sed -i \"s|__PROJECT_PACKAGE__|" + pkgName + "|\" " + self.file_finalAbstraction) - os.system("sed -i \"s|__CONF_OGL_ES_V__|2|\" " + self.file_finalAbstraction) + #os.system("sed -i \"s|__PROJECT_ORG_TYPE__|"+pkgProperties["COMPAGNY_TYPE"]+"|\" " + self.file_finalAbstraction) + #os.system("sed -i \"s|__PROJECT_VENDOR__|"+pkgProperties["COMPAGNY_NAME2"]+"|\" " + self.file_finalAbstraction) + #os.system("sed -i \"s|__PROJECT_NAME__|" + pkgName + "|\" "+ self.file_finalAbstraction) + #os.system("sed -i \"s|__PROJECT_PACKAGE__|" + pkgName + "|\" " + self.file_finalAbstraction) + #os.system("sed -i \"s|__CONF_OGL_ES_V__|2|\" " + self.file_finalAbstraction) lutinTools.CopyFile(pkgProperties["ICON"], self.GetStagingFolder(pkgName) + "/res/drawable/icon.png", True) @@ -191,10 +191,12 @@ class Target(lutinTarget.Target): + "-d " + self.GetStagingFolder(pkgName) + "/build/classes " \ + "-classpath " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar " \ + self.file_finalAbstraction + " "\ - + self.folder_ewol + "/sources/android/src/org/ewol/interfaceJNI.java " \ - + self.folder_ewol + "/sources/android/src/org/ewol/interfaceOpenGL.java " \ - + self.folder_ewol + "/sources/android/src/org/ewol/interfaceSurfaceView.java " \ - + self.folder_ewol + "/sources/android/src/org/ewol/interfaceAudio.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/EwolAudioTask.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/EwolCallback.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/EwolConstants.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/Ewol.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/EwolRendererGL.java " \ + + self.folder_ewol + "/sources/android/src/org/ewol/EwolSurfaceViewGL.java " \ + self.GetStagingFolder(pkgName) + "/src/R.java " RunCommand(cmdLine)