[DEV] add 64 bit dependence on the andoid SDK
This commit is contained in:
parent
265542cb3d
commit
8bea438e57
@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
import platform
|
import platform
|
||||||
|
import sys
|
||||||
import lutinDebug as debug
|
import lutinDebug as debug
|
||||||
|
|
||||||
# print os.name # ==> 'posix'
|
# print os.name # ==> 'posix'
|
||||||
@ -14,3 +15,6 @@ else:
|
|||||||
|
|
||||||
debug.debug(" host.OS = " + OS)
|
debug.debug(" host.OS = " + OS)
|
||||||
|
|
||||||
|
|
||||||
|
OS64BITS = sys.maxsize > 2**32
|
||||||
|
OS32BITS = OS64BITS==False
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
import lutinDebug as debug
|
import lutinDebug as debug
|
||||||
import lutinTarget
|
import lutinTarget
|
||||||
import lutinTools
|
import lutinTools
|
||||||
|
import lutinHost
|
||||||
import os
|
import os
|
||||||
|
|
||||||
def RunCommand(cmdLine):
|
def RunCommand(cmdLine):
|
||||||
@ -22,8 +23,10 @@ class Target(lutinTarget.Target):
|
|||||||
self.folder_ndk = os.getenv('PROJECT_NDK', lutinTools.GetRunFolder() + "/../android/ndk")
|
self.folder_ndk = os.getenv('PROJECT_NDK', lutinTools.GetRunFolder() + "/../android/ndk")
|
||||||
self.folder_sdk = os.getenv('PROJECT_SDK', lutinTools.GetRunFolder() + "/../android/sdk")
|
self.folder_sdk = os.getenv('PROJECT_SDK', lutinTools.GetRunFolder() + "/../android/sdk")
|
||||||
arch = "ARMv7"
|
arch = "ARMv7"
|
||||||
|
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-"
|
cross = self.folder_ndk + "/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-"
|
||||||
|
|
||||||
if typeCompilator!="gcc":
|
if typeCompilator!="gcc":
|
||||||
debug.error("Android does not support '" + typeCompilator + "' compilator ... availlable : [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/
|
# 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")
|
debug.printElement("pkg", "R.java", "<==", "Resources files")
|
||||||
lutinTools.CreateDirectoryOfFile(self.GetStagingFolder(pkgName) + "/src/noFile")
|
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 " \
|
+ "-M " + self.GetStagingFolder(pkgName) + "/AndroidManifest.xml " \
|
||||||
+ "-F " + self.GetStagingFolder(pkgName) + "/resources.res " \
|
+ "-F " + self.GetStagingFolder(pkgName) + "/resources.res " \
|
||||||
+ "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\
|
+ "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\
|
||||||
|
Loading…
x
Reference in New Issue
Block a user