MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust java paths

Browse Source
This commit is contained in:
topjohnwu 2017-10-30 03:45:50 +08:00
parent fe1439fbac
commit e97bdb53f4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.py
View File

@ -151,7 +151,8 @@ def build_snet(args):
os.chdir('..') os.chdir('..')
def sign_adjust_zip(unsigned, output): def sign_adjust_zip(unsigned, output):
jarsigner = os.path.join('java', 'jarsigner', 'build', 'libs', 'jarsigner-fat.jar') signer_name = 'zipsigner-1.0.jar'
jarsigner = os.path.join('java', 'crypto', 'build', 'libs', signer_name)
if os.name != 'nt' and not os.path.exists(os.path.join('ziptools', 'zipadjust')): if os.name != 'nt' and not os.path.exists(os.path.join('ziptools', 'zipadjust')):
header('* Building zipadjust') header('* Building zipadjust')
@ -160,11 +161,11 @@ def sign_adjust_zip(unsigned, output):
if proc.returncode != 0: if proc.returncode != 0:
error('Build zipadjust failed!') error('Build zipadjust failed!')
if not os.path.exists(jarsigner): if not os.path.exists(jarsigner):
header('* Building jarsigner-fat.jar') header('* Building ' + signer_name)
os.chdir('java') os.chdir('java')
proc = subprocess.run('{} jarsigner:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True) proc = subprocess.run('{} crypto:shadowJar'.format(os.path.join('.', 'gradlew')), shell=True)
if proc.returncode != 0: if proc.returncode != 0:
error('Build jarsigner-fat.jar failed!') error('Build {} failed!'.format(signer_name))
os.chdir('..') os.chdir('..')
header('* Signing / Adjusting Zip') header('* Signing / Adjusting Zip')

2
java

@ -1 +1 @@
Subproject commit 4956d826fbdbad35645260aa3edb3b746651cceb Subproject commit 05f41928cd0f72ddab557c8db6c2fc11c3fd08e6