Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
561c1fb7
Commit
561c1fb7
authored
Jun 15, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update MagiskManager
parent
806fec70
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
MagiskManager
MagiskManager
+1
-1
build.py
build.py
+6
-5
apksigner.jar
ziptools/apksigner.jar
+0
-0
No files found.
MagiskManager
@
e0b4d1c1
Subproject commit
d3ff482c9b46f58626fdcb6289ffa0cefbf2afcc
Subproject commit
e0b4d1c1e4889fdbd66cc3cb0d2a457ba8e4f693
build.py
View file @
561c1fb7
...
@@ -76,9 +76,9 @@ def build_apk(args):
...
@@ -76,9 +76,9 @@ def build_apk(args):
if
proc
.
returncode
!=
0
:
if
proc
.
returncode
!=
0
:
error
(
'Build Magisk Manager failed!'
)
error
(
'Build Magisk Manager failed!'
)
unsigned
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'app-release-unsigned.apk'
)
unsigned
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'
release'
,
'
app-release-unsigned.apk'
)
aligned
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'app-release-aligned.apk'
)
aligned
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'
release'
,
'
app-release-aligned.apk'
)
release
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'app-release.apk'
)
release
=
os
.
path
.
join
(
'app'
,
'build'
,
'outputs'
,
'apk'
,
'
release'
,
'
app-release.apk'
)
# Find the latest build tools
# Find the latest build tools
build_tool
=
sorted
(
os
.
listdir
(
os
.
path
.
join
(
os
.
environ
[
'ANDROID_HOME'
],
'build-tools'
)))[
-
1
]
build_tool
=
sorted
(
os
.
listdir
(
os
.
path
.
join
(
os
.
environ
[
'ANDROID_HOME'
],
'build-tools'
)))[
-
1
]
...
@@ -93,7 +93,7 @@ def build_apk(args):
...
@@ -93,7 +93,7 @@ def build_apk(args):
error
(
'Zipalign Magisk Manager failed!'
)
error
(
'Zipalign Magisk Manager failed!'
)
proc
=
subprocess
.
run
(
'{} sign --ks {} --out {} {}'
.
format
(
proc
=
subprocess
.
run
(
'{} sign --ks {} --out {} {}'
.
format
(
os
.
path
.
join
(
os
.
environ
[
'ANDROID_HOME'
],
'build-tools'
,
build_tool
,
'apksigner'
),
'java -jar {}'
.
format
(
os
.
path
.
join
(
'../ziptools/apksigner.jar'
)
),
os
.
path
.
join
(
'..'
,
'release_signature.jks'
),
os
.
path
.
join
(
'..'
,
'release_signature.jks'
),
release
,
aligned
),
shell
=
True
)
release
,
aligned
),
shell
=
True
)
if
proc
.
returncode
!=
0
:
if
proc
.
returncode
!=
0
:
...
@@ -154,7 +154,8 @@ def zip_main(args):
...
@@ -154,7 +154,8 @@ def zip_main(args):
zip_with_msg
(
zipf
,
source
,
target
)
zip_with_msg
(
zipf
,
source
,
target
)
# APK
# APK
source
=
os
.
path
.
join
(
'MagiskManager'
,
'app'
,
'build'
,
'outputs'
,
'apk'
,
'app-release.apk'
if
args
.
release
else
'app-debug.apk'
)
source
=
os
.
path
.
join
(
'MagiskManager'
,
'app'
,
'build'
,
'outputs'
,
'apk'
,
'release'
if
args
.
release
else
'debug'
,
'app-release.apk'
if
args
.
release
else
'app-debug.apk'
)
target
=
os
.
path
.
join
(
'common'
,
'magisk.apk'
)
target
=
os
.
path
.
join
(
'common'
,
'magisk.apk'
)
zip_with_msg
(
zipf
,
source
,
target
)
zip_with_msg
(
zipf
,
source
,
target
)
...
...
ziptools/apksigner.jar
0 → 100644
View file @
561c1fb7
This diff was suppressed by a .gitattributes entry.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment