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

[DEBUG] correct android signing property

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-07 22:08:08 +01:00
parent 31fb9818ff
commit 43c0ec2535
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lutin/module.py
View File

@ -104,7 +104,8 @@ class Module:
"ANDROID_WALLPAPER_PROPERTIES" : [], # To create properties of the wallpaper (no use of EWOL display) "ANDROID_WALLPAPER_PROPERTIES" : [], # To create properties of the wallpaper (no use of EWOL display)
"RIGHT" : [], "RIGHT" : [],
"LICENSE" : "", # by default: no license "LICENSE" : "", # by default: no license
"ADMOD_POSITION" : "top" "ADMOD_POSITION" : "top",
"ANDROID_SIGN" : "no_file.jks"
} }
self.package_prop_default = { "COMPAGNY_TYPE" : True, self.package_prop_default = { "COMPAGNY_TYPE" : True,
"COMPAGNY_NAME" : True, "COMPAGNY_NAME" : True,
@ -123,7 +124,8 @@ class Module:
"ANDROID_WALLPAPER_PROPERTIES" : True, "ANDROID_WALLPAPER_PROPERTIES" : True,
"RIGHT" : True, "RIGHT" : True,
"LICENSE" : True, "LICENSE" : True,
"ADMOD_POSITION" : True "ADMOD_POSITION" : True,
"ANDROID_SIGN" : True
} }
self.sub_heritage_list = None self.sub_heritage_list = None
@ -979,7 +981,8 @@ class Module:
"ANDROID_APPL_TYPE", "ANDROID_APPL_TYPE",
"ADMOD_ID", "ADMOD_ID",
"APPLE_APPLICATION_IOS_ID", "APPLE_APPLICATION_IOS_ID",
"LICENSE"]: "LICENSE",
"ANDROID_SIGN"]:
self.package_prop[variable] = value self.package_prop[variable] = value
self.package_prop_default[variable] = False self.package_prop_default[variable] = False
elif "ADMOD_POSITION" == variable: elif "ADMOD_POSITION" == variable:

2
lutin/z_target/lutinTarget_Android.py
View File

@ -467,7 +467,7 @@ class Target(target.Target):
print("On release mode we need the file : and key an pasword to sign the application ...") print("On release mode we need the file : and key an pasword to sign the application ...")
debug.print_element("pkg", ".apk(signed debug)", "<==", ".apk (not signed)") debug.print_element("pkg", ".apk(signed debug)", "<==", ".apk (not signed)")
cmdLine = "jarsigner " \ cmdLine = "jarsigner " \
+ " -keystore " + base_pkg_path + "/AndroidKey.jks " \ + " -keystore " + pkg_properties["ANDROID_SIGN"] + " " \
+ " -sigalg SHA1withRSA -digestalg SHA1 " \ + " -sigalg SHA1withRSA -digestalg SHA1 " \
+ target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \ + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \
+ " " + pkg_name_application_name + " " + pkg_name_application_name