From 147d0deeb6c3dac0fafd19d9119e9a2d249090c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20B=C3=B6hm?= <andreas@boehm.cx>
Date: Tue, 15 Nov 2022 08:01:18 +0100
Subject: [PATCH] use registerGeneratedResFolders to merge resources

---
 .../groovy/com/kezong/fataar/VariantProcessor.groovy | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
index 63d71eda..7b275f49 100755
--- a/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
+++ b/source/src/main/groovy/com/kezong/fataar/VariantProcessor.groovy
@@ -472,13 +472,11 @@ class VariantProcessor {
         resourceGenTask.configure {
             dependsOn(mExplodeTasks)
 
-            mProject.android.sourceSets.each { DefaultAndroidSourceSet sourceSet ->
-                if (sourceSet.name == mVariant.name) {
-                    for (archiveLibrary in mAndroidArchiveLibraries) {
-                        FatUtils.logInfo("Merge resource，Library res：${archiveLibrary.resFolder}")
-                        sourceSet.res.srcDir(archiveLibrary.resFolder)
-                    }
-                }
+            for (archiveLibrary in mAndroidArchiveLibraries) {
+                FatUtils.logInfo("Merge resource，Library res：${archiveLibrary.resFolder}")
+                mVariant.registerGeneratedResFolders(
+                        mProject.files(archiveLibrary.resFolder)
+                )
             }
         }
     }