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
0b4dd63d
Commit
0b4dd63d
authored
Dec 05, 2020
by
vvb2060
Committed by
topjohnwu
Dec 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stub module always use release build
parent
38d0f85d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
build.gradle.kts
build.gradle.kts
+6
-6
build.py
build.py
+2
-4
No files found.
build.gradle.kts
View file @
0b4dd63d
...
@@ -19,7 +19,7 @@ buildscript {
...
@@ -19,7 +19,7 @@ buildscript {
dependencies
{
dependencies
{
classpath
(
"com.android.tools.build:gradle:4.1.1"
)
classpath
(
"com.android.tools.build:gradle:4.1.1"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.2
0
"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.2
1
"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
@@ -27,7 +27,7 @@ buildscript {
...
@@ -27,7 +27,7 @@ buildscript {
}
}
}
}
tasks
.
register
(
"clean"
,
Delete
::
class
)
{
tasks
.
register
(
"clean"
,
Delete
::
class
)
{
delete
(
rootProject
.
buildDir
)
delete
(
rootProject
.
buildDir
)
}
}
...
@@ -110,12 +110,12 @@ subprojects {
...
@@ -110,12 +110,12 @@ subprojects {
buildTypes
{
buildTypes
{
signingConfigs
.
getByName
(
"config"
).
also
{
signingConfigs
.
getByName
(
"config"
).
also
{
getByName
(
"debug"
)
{
getByName
(
"debug"
)
{
// If keystore exists, sign the APK with custom signature
signingConfig
=
if
(
it
.
storeFile
?.
exists
()
==
true
)
it
if
(
it
.
storeFile
?.
exists
()
==
true
)
else
signingConfigs
.
getByName
(
"debug"
)
signingConfig
=
it
}
}
getByName
(
"release"
)
{
getByName
(
"release"
)
{
signingConfig
=
it
signingConfig
=
if
(
it
.
storeFile
?.
exists
()
==
true
)
it
else
signingConfigs
.
getByName
(
"debug"
)
}
}
}
}
}
}
...
...
build.py
View file @
0b4dd63d
...
@@ -274,9 +274,7 @@ def dump_bin_headers():
...
@@ -274,9 +274,7 @@ def dump_bin_headers():
binary_dump
(
src
,
out
,
'magisk_xz'
)
binary_dump
(
src
,
out
,
'magisk_xz'
)
stub
=
op
.
join
(
config
[
'outdir'
],
'stub-release.apk'
)
stub
=
op
.
join
(
config
[
'outdir'
],
'stub-release.apk'
)
if
not
op
.
exists
(
stub
):
if
not
op
.
exists
(
stub
):
stub
=
op
.
join
(
config
[
'outdir'
],
'stub-debug.apk'
)
error
(
'Build stub APK before building "magiskinit"'
)
if
not
op
.
exists
(
stub
):
error
(
'Build stub APK before building "magiskinit"'
)
with
open
(
op
.
join
(
'native'
,
'out'
,
'binaries.h'
),
'w'
)
as
out
:
with
open
(
op
.
join
(
'native'
,
'out'
,
'binaries.h'
),
'w'
)
as
out
:
with
open
(
stub
,
'rb'
)
as
src
:
with
open
(
stub
,
'rb'
)
as
src
:
binary_dump
(
src
,
out
,
'manager_xz'
)
binary_dump
(
src
,
out
,
'manager_xz'
)
...
@@ -334,7 +332,7 @@ def build_binary(args):
...
@@ -334,7 +332,7 @@ def build_binary(args):
def
build_apk
(
args
,
module
):
def
build_apk
(
args
,
module
):
build_type
=
'Release'
if
args
.
release
else
'Debug'
build_type
=
'Release'
if
args
.
release
or
module
==
'stub'
else
'Debug'
proc
=
execv
([
gradlew
,
f
'{module}:assemble{build_type}'
,
proc
=
execv
([
gradlew
,
f
'{module}:assemble{build_type}'
,
'-PconfigPath='
+
op
.
abspath
(
args
.
config
)])
'-PconfigPath='
+
op
.
abspath
(
args
.
config
)])
...
...
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