Skip to content

Update R8 for Kotlin 1.5.0, enable DEX size metrics back #2739

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

Merged
merged 2 commits into from
Jun 4, 2021
Merged

Update R8 for Kotlin 1.5.0, enable DEX size metrics back #2739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f90ae
Update R8 for Kotlin 1.5.0, enable DEX size metrics back
qwwdfsad Jun 2, 2021
2de8d47
~move RunR8 back to the build script
qwwdfsad Jun 4, 2021
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
56 changes: 0 additions & 56 deletions buildSrc/src/main/kotlin/RunR8.kt
View file
Open in desktop

This file was deleted.

77 changes: 59 additions & 18 deletions ui/kotlinx-coroutines-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
testImplementation("org.robolectric:robolectric:${version("robolectric")}")
testImplementation("org.smali:baksmali:${version("baksmali")}")

"r8"("com.android.tools.build:builder:7.0.0-alpha14")
"r8"("com.android.tools.build:builder:7.1.0-alpha01")
}

val optimizedDexDir = File(buildDir, "dex-optim/")
Expand All @@ -41,24 +41,65 @@ val runR8NoOptim by tasks.registering(RunR8::class) {
dependsOn("jar")
}

// TODO: Disable the test until we have published version of R8 that supports Kotlin 1.5.0 metadata

//tasks.test {
// // Ensure the R8-processed dex is built and supply its path as a property to the test.
// dependsOn(runR8)
// dependsOn(runR8NoOptim)
//
// inputs.files(optimizedDexFile, unOptimizedDexFile)
//
// systemProperty("dexPath", optimizedDexFile.absolutePath)
// systemProperty("noOptimDexPath", unOptimizedDexFile.absolutePath)
//
// // Output custom metric with the size of the optimized dex
// doLast {
// println("##teamcity[buildStatisticValue key='optimizedDexSize' value='${optimizedDexFile.length()}']")
// }
//}
tasks.test {
// Ensure the R8-processed dex is built and supply its path as a property to the test.
dependsOn(runR8)
dependsOn(runR8NoOptim)

inputs.files(optimizedDexFile, unOptimizedDexFile)

systemProperty("dexPath", optimizedDexFile.absolutePath)
systemProperty("noOptimDexPath", unOptimizedDexFile.absolutePath)

// Output custom metric with the size of the optimized dex
doLast {
println("##teamcity[buildStatisticValue key='optimizedDexSize' value='${optimizedDexFile.length()}']")
}
}

externalDocumentationLink(
url = "https://developer.android.com/reference/"
)
/*
* Task used by our ui/android tests to test minification results and keep track of size of the binary.
*/
open class RunR8 : JavaExec() {

@OutputDirectory
lateinit var outputDex: File

@InputFile
lateinit var inputConfig: File

@InputFile
val inputConfigCommon: File = File("testdata/r8-test-common.pro")

@InputFiles
val jarFile: File = project.tasks.named<Zip>("jar").get().archivePath

init {
classpath = project.configurations["r8"]
main = "com.android.tools.r8.R8"
}

override fun exec() {
// Resolve classpath only during execution
val arguments = mutableListOf(
"--release",
"--no-desugaring",
"--min-api", "26",
"--output", outputDex.absolutePath,
"--pg-conf", inputConfig.absolutePath
)
arguments.addAll(project.configurations["runtimeClasspath"].files.map { it.absolutePath })
arguments.add(jarFile.absolutePath)

args = arguments

project.delete(outputDex)
outputDex.mkdirs()

super.exec()
}
}