Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use r8 for dexing and backporting (MOE 1.x) #4

Open
wants to merge 8 commits into
base: moe-1.9.1
Choose a base branch
from
Open

Use r8 for dexing and backporting (MOE 1.x) #4

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8c60d0
Start next dev iteration
Noisyfox Feb 21, 2022
e2b00f2
Merge commit '505b3cba36ffa0ffcfe4ac9e608bb7beb9267e9a' into moe-master
Noisyfox Jul 19, 2022
1841749
POC use d8 for dexing and backporting
Apr 6, 2022
79e4a36
Use r8 for processing
Apr 8, 2022
7814326
Enable predexing and other proguard levels than all again.
May 14, 2022
2fa9dcd
Remove all occurences of dx
May 14, 2022
f5a42d9
Build r8 together with moe
Berstanio Jul 21, 2022
cf08538
Fix processSDK not running on sdk build
Berstanio Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 87 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

group 'org.multi-os-engine'
version '1.9.1-SNAPSHOT'
version '1.10.0-SNAPSHOT'

apply plugin: 'base'
apply plugin: 'maven-publish'
Expand All @@ -32,7 +32,6 @@ def projectDeps = [
':moe.binding.libimobiledevice',
':moe.generator.natjgen',
':moe.ios.device.launcher',
':proguard:app',
]

projectDeps.each { evaluationDependsOn it }
Expand All @@ -53,13 +52,83 @@ if (!rootProject.hasProperty('moe.tools.sdk.mac_only')) {
tasks.buildDeps.dependsOn ':prebuild_libimobiledevice_windows'
}

//////////////////////////////////////////////////////////////////////////
// Prebuild dex files
//////////////////////////////////////////////////////////////////////////
def r8Jar = gradle.includedBuild("r8").projectDir.absolutePath + "/build/libs/r8.jar"
task processDexDesugaredJDK(type: JavaExec) {
dependsOn(gradle.includedBuild("r8").task(":r8"))

classpath = project.files(r8Jar)
ext.dexOutput = file("${buildDir}/moe-desugared-dex.jar")

main 'com.android.tools.r8.L8'
args "--lib", rootProject.external.moe_core.out.moe_core_jar, "--min-api", "21", '--desugared-lib', external.moe_core.out.desugarjdk_json, "--output", "${buildDir}/moe-desugared-dex.jar", external.moe_core.out.desugarjdk_jar

inputs.file(rootProject.external.moe_core.out.moe_core_jar)
outputs.file(dexOutput)
}

task processDexCore(type: JavaExec) {
dependsOn(gradle.includedBuild("r8").task(":r8"))

classpath = project.files(r8Jar)
ext.dexOutput = file("${buildDir}/moe-core-dex.jar")

main 'com.android.tools.r8.D8'
args "--min-api", "21", "--output", "${buildDir}/moe-core-dex.jar", rootProject.external.moe_core.out.moe_core_jar

inputs.file(rootProject.external.moe_core.out.moe_core_jar)
outputs.file(dexOutput)
}

task processDexiOS(type: JavaExec) {
dependsOn(gradle.includedBuild("r8").task(":r8"))

classpath = project.files(r8Jar)
ext.dexOutput = file("${buildDir}/moe-ios-dex.jar")

main 'com.android.tools.r8.D8'
args "--lib", rootProject.external.moe_core.out.moe_core_jar, "--min-api", "21", "--output", "${buildDir}/moe-ios-dex.jar", rootProject.external.moe_core.out.moe_ios_jar

inputs.file(rootProject.external.moe_core.out.moe_ios_jar)
inputs.file(rootProject.external.moe_core.out.moe_core_jar)
outputs.file(ext.dexOutput)
}

task processDexiOSJUnit(type: JavaExec) {
dependsOn(gradle.includedBuild("r8").task(":r8"))

classpath = project.files(r8Jar)
ext.dexOutput = file("${buildDir}/moe-ios-junit-dex.jar")

main 'com.android.tools.r8.D8'
args "--lib", rootProject.external.moe_core.out.moe_core_jar, "--lib", rootProject.external.moe_core.out.moe_ios_jar, "--min-api", "21", "--output", "${buildDir}/moe-ios-junit-dex.jar", rootProject.external.moe_core.out.moe_ios_junit_jar

inputs.file(rootProject.external.moe_core.out.moe_ios_junit_jar)
inputs.file(rootProject.external.moe_core.out.moe_ios_jar)
inputs.file(rootProject.external.moe_core.out.moe_core_jar)
outputs.file(ext.dexOutput)
}

task processSDK {
dependsOn processDexDesugaredJDK
dependsOn processDexCore
dependsOn processDexiOS
dependsOn processDexiOSJUnit
}


def buildfiles(def proj, def subpath, def closure) {
files("${project(proj).buildDir.absolutePath}/$subpath", closure)
}

def getSDKCopySpec() {
copySpec {
into('sdk') {
from files(rootProject.external.moe_core.out.desugarjdk_json) {
rename rootProject.external.moe_core.out.desugarjdk_json.name, 'moe-desugared-lib.json'
}
from files(rootProject.external.moe_core.out.moe_core_jar) {
rename rootProject.external.moe_core.out.moe_core_jar.name, 'moe-core.jar'
}
Expand Down Expand Up @@ -90,6 +159,18 @@ def getSDKCopySpec() {
from files(rootProject.external.moe_core.out.moe_core_certificates_zip) {
rename rootProject.external.moe_core.out.moe_core_certificates_zip.name, 'moe-core-certificates.zip'
}
from files(processDexDesugaredJDK.dexOutput) {
rename processDexDesugaredJDK.dexOutput.name, processDexDesugaredJDK.dexOutput.name
}
from files(processDexCore.dexOutput) {
rename processDexCore.dexOutput.name, processDexCore.dexOutput.name
}
from files(processDexiOS.dexOutput) {
rename processDexiOS.dexOutput.name, processDexiOS.dexOutput.name
}
from files(processDexiOSJUnit.dexOutput) {
rename processDexiOSJUnit.dexOutput.name, processDexiOSJUnit.dexOutput.name
}
}
into('sdk/iphoneos/MOE.framework') {
from files(rootProject.external.moe_core.out.iphoneos_MOE_framework)
Expand All @@ -101,12 +182,6 @@ def getSDKCopySpec() {
from files(rootProject.external.moe_core.out.dex2oat_exec.parentFile) {
include rootProject.external.moe_core.out.dex2oat_exec.name
}
from files(rootProject.external.moe_core.out.dx_exec.parentFile) {
include rootProject.external.moe_core.out.dx_exec.name
}
from files(rootProject.external.moe_core.out.dx_jar.parentFile) {
include rootProject.external.moe_core.out.dx_jar.name
}

from buildfiles(':moe.ios.device.launcher', 'libs') {
include 'moe.ios.device.launcher.jar'
Expand All @@ -127,8 +202,8 @@ def getSDKCopySpec() {
rename 'moe.generator.natjgen.jar', 'wrapnatjgen.jar'
}

from buildfiles(':proguard:app', 'libs') {
include 'proguard.jar'
from files(gradle.includedBuild("r8").projectDir.absolutePath + "/build/libs/") {
include 'r8.jar'
}

from files('.') {
Expand Down Expand Up @@ -159,11 +234,11 @@ def getSDKCopySpec() {
}
}

task sdk(type: Zip, dependsOn: buildDeps) {
task sdk(type: Zip, dependsOn: [processSDK, buildDeps]) {
with getSDKCopySpec()
}

task devsdk(type: Copy, dependsOn: buildDeps) {
task devsdk(type: Copy, dependsOn: [processSDK, buildDeps]) {
destinationDir = file("$buildDir/dev-sdk")
with getSDKCopySpec()
}
Expand Down