ignore android runtime resources and manifest

Plamen5kov · Plamen5kov · commit a7333c37bb81 · 2016-01-28T13:54:32.000+02:00
diff --git a/src/build.gradle b/src/build.gradle
@@ -90,6 +90,11 @@ android {
 	lintOptions {
 		abortOnError false
 	}
+	
+	packagingOptions {
+		exclude 'resources.arsc'
+		exclude "AndroidManifest.xml"
+	}
 }
 
 repositories {
diff --git a/test-app/build.gradle b/test-app/build.gradle
@@ -107,11 +107,6 @@ 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
`@@ -90,6 +90,11 @@ android {`
`90`	`90`	`lintOptions {`
`91`	`91`	`abortOnError false`
`92`	`92`	`}`
	`93`	`+`
	`94`	`+ packagingOptions {`
	`95`	`+ exclude 'resources.arsc'`
	`96`	`+ exclude "AndroidManifest.xml"`
	`97`	`+ }`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,6 @@ 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`		`- }`
`115`	`110`	`}`
`116`	`111`
`117`	`112`	`def sdkPath = android.sdkDirectory.getAbsolutePath();`