From cde20a4b77ee1c14bfbdc21f3e2131e4921d61cf Mon Sep 17 00:00:00 2001 From: CnC-Robert Date: Thu, 21 Jul 2022 13:14:55 +0200 Subject: [PATCH 1/3] add --custom-aapt2-binary --- src/main/kotlin/app/revanced/cli/command/MainCommand.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index e17b59ad..27165095 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -113,6 +113,9 @@ internal object MainCommand : Runnable { description = ["Clean the temporal resource cache directory. This will be done anyways when running the patcher"] ) var clean: Boolean = false + + @Option(names = ["--custom-aapt2-binary"], description = ["Path to custom aapt2 binary"]) + var aaptPath: String? = null } override fun run() { @@ -149,6 +152,7 @@ internal object MainCommand : Runnable { _args.inputFile, args.cacheDirectory, !args.disableResourcePatching, + args.aaptPath ?: "", logger = PatcherLogger ) ) From e6dfa911afffe6b130010022f2d238830544096c Mon Sep 17 00:00:00 2001 From: Robert <72943079+CnC-Robert@users.noreply.github.com> Date: Thu, 21 Jul 2022 14:01:29 +0200 Subject: [PATCH 2/3] Update src/main/kotlin/app/revanced/cli/command/MainCommand.kt Co-authored-by: oSumAtrIX --- src/main/kotlin/app/revanced/cli/command/MainCommand.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index 27165095..29112f5a 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -115,7 +115,7 @@ internal object MainCommand : Runnable { var clean: Boolean = false @Option(names = ["--custom-aapt2-binary"], description = ["Path to custom aapt2 binary"]) - var aaptPath: String? = null + var aaptPath: String = "" } override fun run() { From 7a82dd5811bd1e789520436584741146426da032 Mon Sep 17 00:00:00 2001 From: Robert <72943079+CnC-Robert@users.noreply.github.com> Date: Thu, 21 Jul 2022 14:01:36 +0200 Subject: [PATCH 3/3] Update src/main/kotlin/app/revanced/cli/command/MainCommand.kt Co-authored-by: oSumAtrIX --- src/main/kotlin/app/revanced/cli/command/MainCommand.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt index 29112f5a..0616a4a2 100644 --- a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -152,7 +152,7 @@ internal object MainCommand : Runnable { _args.inputFile, args.cacheDirectory, !args.disableResourcePatching, - args.aaptPath ?: "", + args.aaptPath, logger = PatcherLogger ) )