atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct android new NDK r10

Browse Source
This commit is contained in:
Edouard DUPIN 2015-04-22 00:16:34 +02:00
parent 0ba120d0d9
commit e531092bea
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lutinTarget.py
View File

@ -124,6 +124,8 @@ class Target:
list.append("0") list.append("0")
if len(list) == 2: if len(list) == 2:
list.append("0") list.append("0")
if len(list) > 3:
list = list[:3]
out = 0; out = 0;
offset = 1000**(len(list)-1) offset = 1000**(len(list)-1)
for elem in list: for elem in list:
@ -153,8 +155,7 @@ class Target:
if ret == False: if ret == False:
debug.error("Can not get the g++/clang++ version ...") debug.error("Can not get the g++/clang++ version ...")
self.xx_version = self.create_number_from_version_string(ret) self.xx_version = self.create_number_from_version_string(ret)
debug.warning("plop " + self.xx) debug.verbose(self.config["compilator"] + "++ version=" + str(ret) + " number=" + str(self.xx_version))
debug.warning(self.config["compilator"] + "++ version=" + str(ret) + " number=" + str(self.xx_version))
self.ld = self.cross + "ld" self.ld = self.cross + "ld"
self.nm = self.cross + "nm" self.nm = self.cross + "nm"

10
target/lutinTarget_Android.py
View File

@ -671,11 +671,6 @@ class Target(lutinTarget.Target):
# Create a key for signing your application: # Create a key for signing your application:
# keytool -genkeypair -v -keystore AndroidKey.jks -storepass Pass__AndroidDebugKey -alias alias__AndroidDebugKey -keypass PassKey__AndroidDebugKey -keyalg RSA -validity 36500 # keytool -genkeypair -v -keystore AndroidKey.jks -storepass Pass__AndroidDebugKey -alias alias__AndroidDebugKey -keypass PassKey__AndroidDebugKey -keyalg RSA -validity 36500
if self.config["mode"] == "debug": if self.config["mode"] == "debug":
tmpFile = open("tmpPass.boo", 'w')
tmpFile.write("Pass__AndroidDebugKey\n")
tmpFile.write("PassKey__AndroidDebugKey\n")
tmpFile.flush()
tmpFile.close()
debug.print_element("pkg", ".apk(signed debug)", "<==", ".apk (not signed)") debug.print_element("pkg", ".apk(signed debug)", "<==", ".apk (not signed)")
# verbose mode : # verbose mode :
#debugOption = "-verbose -certs " #debugOption = "-verbose -certs "
@ -684,8 +679,10 @@ class Target(lutinTarget.Target):
+ debugOption \ + debugOption \
+ "-keystore " + tools.get_current_path(__file__) + "/AndroidDebugKey.jks " \ + "-keystore " + tools.get_current_path(__file__) + "/AndroidDebugKey.jks " \
+ " -sigalg SHA1withRSA -digestalg SHA1 " \ + " -sigalg SHA1withRSA -digestalg SHA1 " \
+ " -storepass Pass__AndroidDebugKey " \
+ " -keypass PassKey__AndroidDebugKey " \
+ self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \ + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \
+ " alias__AndroidDebugKey < tmpPass.boo" + " alias__AndroidDebugKey"
lutinMultiprocess.run_command(cmdLine) lutinMultiprocess.run_command(cmdLine)
tmpFile = open("tmpPass.boo", 'w') tmpFile = open("tmpPass.boo", 'w')
tmpFile.write("\n") tmpFile.write("\n")
@ -744,6 +741,7 @@ class Target(lutinTarget.Target):
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
debug.info("logcat of android board") debug.info("logcat of android board")
debug.debug("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
debug.info("cmd: " + self.folder_sdk + "/platform-tools/adb shell logcat ")
cmdLine = self.folder_sdk + "/platform-tools/adb shell logcat " cmdLine = self.folder_sdk + "/platform-tools/adb shell logcat "
lutinMultiprocess.run_command(cmdLine) lutinMultiprocess.run_command(cmdLine)