From c81a98c659285f2dac3f597b60171795770be249 Mon Sep 17 00:00:00 2001 From: coltonliang Date: Wed, 19 Oct 2022 11:26:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E4=B8=AD?= =?UTF-8?q?=E6=9C=AA=E9=85=8D=E7=BD=AEandroid.aaptOptions.additionalParame?= =?UTF-8?q?ters=E6=97=B6,tinkerApplyResourcePath=E4=B8=8D=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../build/gradle/task/TinkerResourceIdTask.groovy | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/task/TinkerResourceIdTask.groovy b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/task/TinkerResourceIdTask.groovy index 19cae6e0..d1aa43c4 100644 --- a/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/task/TinkerResourceIdTask.groovy +++ b/tinker-build/tinker-patch-gradle-plugin/src/main/groovy/com/tencent/tinker/build/gradle/task/TinkerResourceIdTask.groovy @@ -429,14 +429,12 @@ public class TinkerResourceIdTask extends DefaultTask { def processResourcesTask = Compatibilities.getProcessResourcesTask(project, variant) processResourcesTask.doFirst { def aaptParams = project.android.aaptOptions.additionalParameters - if (aaptParams != null) { - if (!aaptParams.contains('--stable-ids')) { - addStableIdsFileToAdditionalParameters(processResourcesTask) - } else { - project.logger.error('** [NOTICE] ** Manually specified stable-ids file was detected, ' - + 'Tinker will give up injecting generated stable-ids file. Please ensure your stable-ids file ' - + 'keep ids of all resources in base apk.') - } + if (aaptParams == null || !aaptParams.contains('--stable-ids')) { + addStableIdsFileToAdditionalParameters(processResourcesTask) + } else { + project.logger.error('** [NOTICE] ** Manually specified stable-ids file was detected, ' + + 'Tinker will give up injecting generated stable-ids file. Please ensure your stable-ids file ' + + 'keep ids of all resources in base apk.') } if (project.hasProperty("tinker.aapt2.public")) {