ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2026-01-18 17:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enforce aapt v2

Browse Source
This commit is contained in:
Lucaskyy
2022-06-14 22:34:10 +02:00
parent 8ce3535427
commit b68b0bf3d7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/app/revanced/patcher/Patcher.kt
View File

@@ -51,10 +51,7 @@ class Patcher(private val options: PatcherOptions) {
if (outDir.exists()) outDir.deleteRecursively() if (outDir.exists()) outDir.deleteRecursively()
outDir.mkdirs() outDir.mkdirs()
val androlib = Androlib(BuildOptions().also { buildOptions -> val androlib = Androlib(BuildOptions().also { it.setBuildOptions(options) })
buildOptions.aaptPath = options.aaptPath
buildOptions.frameworkFolderLocation = options.frameworkFolderLocation
})
val resourceTable = androlib.getResTable(extInputFile, true) val resourceTable = androlib.getResTable(extInputFile, true)
val packageMetadata = PackageMetadata() val packageMetadata = PackageMetadata()
@@ -146,8 +143,7 @@ class Patcher(private val options: PatcherOptions) {
val androlibResources = AndrolibResources().also { resources -> val androlibResources = AndrolibResources().also { resources ->
resources.buildOptions = BuildOptions().also { buildOptions -> resources.buildOptions = BuildOptions().also { buildOptions ->
buildOptions.aaptPath = options.aaptPath buildOptions.setBuildOptions(options)
buildOptions.frameworkFolderLocation = options.frameworkFolderLocation
buildOptions.isFramework = metaInfo.isFrameworkApk buildOptions.isFramework = metaInfo.isFrameworkApk
buildOptions.resourcesAreCompressed = metaInfo.compressionType buildOptions.resourcesAreCompressed = metaInfo.compressionType
buildOptions.doNotCompress = metaInfo.doNotCompress buildOptions.doNotCompress = metaInfo.doNotCompress
@@ -299,3 +295,9 @@ class Patcher(private val options: PatcherOptions) {
} }
} }
} }
private fun BuildOptions.setBuildOptions(options: PatcherOptions) {
this.aaptPath = options.aaptPath
this.useAapt2 = true
this.frameworkFolderLocation = options.frameworkFolderLocation
}