Restructure project

This commit is contained in:
topjohnwu 2020-07-04 04:09:19 -07:00
parent 9348c5bad9
commit 67f7935421
40 changed files with 7 additions and 6 deletions

View File

@ -69,8 +69,8 @@ androidExtensions {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':shared')
implementation project(':signing')
implementation project(':app:shared')
implementation project(':app:signing')
implementation 'com.github.topjohnwu:jtar:1.0.0'
implementation 'com.jakewharton.timber:timber:4.7.1'

View File

@ -200,11 +200,11 @@ def sign_zip(unsigned, output, release):
return
signer_name = 'zipsigner-3.0.jar'
zipsigner = op.join('signing', 'build', 'libs', signer_name)
zipsigner = op.join('app', 'signing', 'build', 'libs', signer_name)
if not op.exists(zipsigner):
header('* Building ' + signer_name)
proc = execv([gradlew, 'signing:shadowJar'])
proc = execv([gradlew, 'app:signing:shadowJar'])
if proc.returncode != 0:
error(f'Build {signer_name} failed!')
@ -361,6 +361,7 @@ def build_stub(args):
header('* Building Magisk Manager stub')
build_apk(args, 'stub')
# Bind mount snet package on top of the stub folder
def build_snet(args):
header('* Building snet extension')

View File

@ -1 +1 @@
include ':app', ':signing', ':native', ':stub', ':shared'
include ':app', ':app:signing', ':app:shared', ':native', ':stub'

View File

@ -20,5 +20,5 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':shared')
implementation project(':app:shared')
}