lone-cloud/prism-android
0
0
Fork 0
mirror of https://github.com/lone-cloud/prism-android synced 2026-06-03 19:54:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Allow overriding AAPT2

Browse source
This commit is contained in:
sim 2025-10-08 11:53:10 +02:00
parent f49d4f9f2e
commit 8b3e265c56
2 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/build.gradle.kts
View file

@ -1,4 +1,4 @@
import RunBundletoolTask.Companion.buildToolInfo import RunBundletoolTask.Companion.aapt2
import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.register
plugins { plugins {
@ -80,27 +80,27 @@ dependencies {
tasks.register<RunBundletoolTask>("reproduceUniversal") { tasks.register<RunBundletoolTask>("reproduceUniversal") {
group = "build" group = "build"
description = "Generate universal .apks from .aab avec bundletool" description = "Generate universal .apks from .aab with bundletool"
dependsOn("bundleRelease") dependsOn("bundleRelease")
aabFile = project.rootDir.resolve("app/build/outputs/bundle/release/app-release.aab") aabFile = project.rootDir.resolve("app/build/outputs/bundle/release/app-release.aab")
universalApks = project.rootDir.resolve("universal.apks") universalApks = project.rootDir.resolve("universal.apks")
aapt2 = project.aapt2(androidComponents)
signature.set(RunBundletoolTask.Signature.UnsignedOrDebug) signature.set(RunBundletoolTask.Signature.UnsignedOrDebug)
buildToolInfo.set(androidComponents.buildToolInfo())
} }
tasks.register<RunBundletoolTask>("bundletoolBuildApks") { tasks.register<RunBundletoolTask>("bundletoolBuildApks") {
group = "build" group = "build"
description = "Generate default and universal .apks from .aab avec bundletool" description = "Generate default and universal .apks from .aab with bundletool"
val aabPath = System.getenv("AAB") ?: error("AAB not set") val aabPath = System.getenv("AAB") ?: error("AAB not set")
aabFile = project.rootDir.resolve(aabPath) aabFile = project.rootDir.resolve(aabPath)
universalApks = project.rootDir.resolve("universal.apks") universalApks = project.rootDir.resolve("universal.apks")
defaultApks = project.rootDir.resolve("app.apks") defaultApks = project.rootDir.resolve("app.apks")
aapt2 = project.aapt2(androidComponents)
val ks = System.getenv("KS") ?: error("KS not set") val ks = System.getenv("KS") ?: error("KS not set")
val ksPass = System.getenv("KS_PASS") ?: error("KS_PASS not set") val ksPass = System.getenv("KS_PASS") ?: error("KS_PASS not set")
val keyAlias = System.getenv("KEY_ALIAS") ?: error("KEY_ALIAS not set") val keyAlias = System.getenv("KEY_ALIAS") ?: error("KEY_ALIAS not set")
signature.set(RunBundletoolTask.Signature.Signed(ks, ksPass, keyAlias)) signature.set(RunBundletoolTask.Signature.Signed(ks, ksPass, keyAlias))
buildToolInfo.set(androidComponents.buildToolInfo())
} }

43
buildSrc/src/main/kotlin/RunBundletoolTask.kt
View file

@ -7,6 +7,7 @@ import com.android.tools.build.bundletool.commands.BuildApksCommand
import com.android.tools.build.bundletool.model.Password import com.android.tools.build.bundletool.model.Password
import com.android.tools.build.bundletool.model.SigningConfiguration import com.android.tools.build.bundletool.model.SigningConfiguration
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project
import org.gradle.api.file.RegularFileProperty import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.InputFile
@ -40,7 +41,7 @@ abstract class RunBundletoolTask : DefaultTask() {
abstract val universalApks: RegularFileProperty abstract val universalApks: RegularFileProperty
@get:Internal @get:Internal
abstract val buildToolInfo: Property<BuildToolInfo> abstract val aapt2: RegularFileProperty
@get:Internal @get:Internal
abstract val signature: Property<Signature> abstract val signature: Property<Signature>
@ -48,10 +49,13 @@ abstract class RunBundletoolTask : DefaultTask() {
@Suppress("NewApi") @Suppress("NewApi")
@TaskAction @TaskAction
fun generateApks() { fun generateApks() {
val aapt2Path = buildToolInfo.get().getPath(BuildToolInfo.PathId.AAPT2) val aapt2Path = aapt2.get().asFile.toPath()
?: error("aapt2 not found") val aabPath = aabFile.get().asFile.toPath()
val aapt2Command = Aapt2Command.createFromExecutablePath(Paths.get(aapt2Path)) println("➡ Compiling $aabPath")
println("➡ Using $aapt2Path")
val aapt2Command = Aapt2Command.createFromExecutablePath(aapt2Path)
val signature = signature.get() val signature = signature.get()
val signingConfig = if (signature is Signature.Signed) { val signingConfig = if (signature is Signature.Signed) {
SigningConfiguration.extractFromKeystore( SigningConfiguration.extractFromKeystore(
@ -82,7 +86,7 @@ abstract class RunBundletoolTask : DefaultTask() {
.build() .build()
.execute() .execute()
println("$outputFile generated") println("✅ $outputFile generated")
} }
if (defaultApks.isPresent) { if (defaultApks.isPresent) {
val outputFile = defaultApks.get().asFile.toPath() val outputFile = defaultApks.get().asFile.toPath()
@ -101,23 +105,28 @@ abstract class RunBundletoolTask : DefaultTask() {
.build() .build()
.execute() .execute()
println("$outputFile generated") println("✅ $outputFile generated")
} }
} }
companion object { companion object {
@Suppress("NewApi") @Suppress("NewApi")
fun ApplicationAndroidComponentsExtension.buildToolInfo(): BuildToolInfo { fun Project.aapt2(androidComponents: ApplicationAndroidComponentsExtension): java.io.File {
val buildToolsVersion = SdkConstants.CURRENT_BUILD_TOOLS_VERSION val path = if (project.hasProperty("android.aapt2FromMavenOverride")) {
val buildToolsDir = Paths.get( project.property("android.aapt2FromMavenOverride") as String
sdkComponents.sdkDirectory.get().toString(), } else {
SdkConstants.FD_BUILD_TOOLS, val buildToolsVersion = SdkConstants.CURRENT_BUILD_TOOLS_VERSION
SdkConstants.CURRENT_BUILD_TOOLS_VERSION val buildToolsDir = Paths.get(
) androidComponents.sdkComponents.sdkDirectory.get().toString(),
return BuildToolInfo.fromStandardDirectoryLayout( SdkConstants.FD_BUILD_TOOLS,
Revision.parseRevision(buildToolsVersion), SdkConstants.CURRENT_BUILD_TOOLS_VERSION
buildToolsDir )
) BuildToolInfo.fromStandardDirectoryLayout(
Revision.parseRevision(buildToolsVersion),
buildToolsDir
).getPath(BuildToolInfo.PathId.AAPT2)
}
return project.rootDir.resolve(path)
} }
} }
} }