diff --git a/lutinHost.py b/lutinHost.py index e26d1af..849b7c5 100644 --- a/lutinHost.py +++ b/lutinHost.py @@ -1,5 +1,6 @@ #!/usr/bin/python import platform +import sys import lutinDebug as debug # print os.name # ==> 'posix' @@ -14,3 +15,6 @@ else: debug.debug(" host.OS = " + OS) + +OS64BITS = sys.maxsize > 2**32 +OS32BITS = OS64BITS==False diff --git a/lutinTargetAndroid.py b/lutinTargetAndroid.py index 197f8f2..2792232 100644 --- a/lutinTargetAndroid.py +++ b/lutinTargetAndroid.py @@ -3,6 +3,7 @@ import lutinDebug as debug import lutinTarget import lutinTools +import lutinHost import os def RunCommand(cmdLine): @@ -22,8 +23,10 @@ class Target(lutinTarget.Target): self.folder_ndk = os.getenv('PROJECT_NDK', lutinTools.GetRunFolder() + "/../android/ndk") self.folder_sdk = os.getenv('PROJECT_SDK', lutinTools.GetRunFolder() + "/../android/sdk") arch = "ARMv7" - cross = self.folder_ndk + "/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-" - + if lutinHost.OS64BITS==True: + cross = self.folder_ndk + "/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86_64/bin/arm-linux-androideabi-" + else: + cross = self.folder_ndk + "/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-" if typeCompilator!="gcc": debug.error("Android does not support '" + typeCompilator + "' compilator ... availlable : [gcc]") @@ -175,7 +178,7 @@ class Target(lutinTarget.Target): # http://asantoso.wordpress.com/2009/09/15/how-to-build-android-application-package-apk-from-the-command-line-using-the-sdk-tools-continuously-integrated-using-cruisecontrol/ debug.printElement("pkg", "R.java", "<==", "Resources files") lutinTools.CreateDirectoryOfFile(self.GetStagingFolder(pkgName) + "/src/noFile") - cmdLine = self.folder_sdk + "/platform-tools/aapt p -f " \ + cmdLine = self.folder_sdk + "/build-tools/17.0.0/aapt p -f " \ + "-M " + self.GetStagingFolder(pkgName) + "/AndroidManifest.xml " \ + "-F " + self.GetStagingFolder(pkgName) + "/resources.res " \ + "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\