File tree Expand file tree Collapse file tree 1 file changed +8
-10
lines changed Expand file tree Collapse file tree 1 file changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -312,18 +312,16 @@ afterEvaluate {
312312 if (isAndroidLibrary) {
313313 into (" library_assets/${ variant.name} /out" )
314314 } else {
315- // Workaround for Android Gradle Plugin 7.1 asset directory
316- if (androidComponents. pluginVersion. major == 7 && androidComponents. pluginVersion. minor == 1 ) {
317- into(" $buildDir /intermediates/assets/${ variant.name} /merge${ targetName} Assets" )
318- }else {
319- into (" assets/${ targetPath} " )
315+ into (" assets/${ targetPath} " )
320316
321- // Workaround for Android Gradle Plugin 3.2+ new asset directory
322- into (" merged_assets/${ variant.name} /merge${ targetName} Assets/out" )
317+ // Workaround for Android Gradle Plugin 3.2+ new asset directory
318+ into (" merged_assets/${ variant.name} /merge${ targetName} Assets/out" )
323319
324- // Workaround for Android Gradle Plugin 3.4+ new asset directory
325- into (" merged_assets/${ variant.name} /out" )
326- }
320+ // Workaround for Android Gradle Plugin 3.4+ new asset directory
321+ into (" merged_assets/${ variant.name} /out" )
322+
323+ // Workaround for Android Gradle Plugin 7.1 asset directory
324+ into(" $buildDir /intermediates/assets/${ variant.name} /merge${ targetName} Assets" )
327325 }
328326 }
329327
You can’t perform that action at this time.
0 commit comments