Change merged assets path for android gradle 3.5.0

vmutafov · vtrifonov · commit 7f768604d93b · 2019-09-17T16:17:24.000+03:00
diff --git a/test-app/app/build.gradle b/test-app/app/build.gradle
@@ -564,8 +564,8 @@ class EmptyRunnable implements Runnable {
 
 def getMergedAssetsOutputPath() {
     if (!project.hasProperty("mergedAssetsOutputPath")) {
-        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0
-        project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"
+        // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.0
+        project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/merged_assets/" + project.selectedBuildType + "/out"
     }
     return project.ext.mergedAssetsOutputPath
 }

Original file line number	Diff line number	Diff line change
`@@ -564,8 +564,8 @@ class EmptyRunnable implements Runnable {`
`564`	`564`
`565`	`565`	`def getMergedAssetsOutputPath() {`
`566`	`566`	`if (!project.hasProperty("mergedAssetsOutputPath")) {`
`567`		`- // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.4.0`
`568`		`- project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/assets/" + project.selectedBuildType + "/out"`
	`567`	`+ // mergedAssetsOutputPath not found fallback to the default value for android gradle plugin 3.5.0`
	`568`	`+ project.ext.mergedAssetsOutputPath = "$projectDir/build/intermediates/merged_assets/" + project.selectedBuildType + "/out"`
`569`	`569`	`}`
`570`	`570`	`return project.ext.mergedAssetsOutputPath`
`571`	`571`	`}`