added packaging options because of gradle 2.9

plamen5kov · plamen5kov · commit 1b2b0acbda9e · 2016-01-26T14:36:05.000+02:00
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -107,6 +107,11 @@ android {
 		def tsk = variant.mergeAssets
 		tsk.dependsOn(copyMetadata)
 	}
+	
+	packagingOptions {
+		exclude 'resources.arsc'
+		exclude "AndroidManifest.xml"
+	}
 }
 
 def sdkPath = android.sdkDirectory.getAbsolutePath();

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,11 @@ android {`
`107`	`107`	`def tsk = variant.mergeAssets`
`108`	`108`	`tsk.dependsOn(copyMetadata)`
`109`	`109`	`}`
	`110`	`+`
	`111`	`+ packagingOptions {`
	`112`	`+ exclude 'resources.arsc'`
	`113`	`+ exclude "AndroidManifest.xml"`
	`114`	`+ }`
`110`	`115`	`}`
`111`	`116`
`112`	`117`	`def sdkPath = android.sdkDirectory.getAbsolutePath();`