Add pickFirsts for encp-header.ht in resources to resolve conflicts

eyedeekay · eyedeekay · commit c762c0d08c44 · 2026-04-15T15:04:51.000-04:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,6 +52,7 @@ android {
         }
         resources {
             excludes += ['LICENSE.txt']
+            pickFirsts += ['net/i2p/i2ptunnel/resources/proxy/encp-header.ht']
         }
     }
     flavorDimensions 'tier'

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ android {`
`52`	`52`	`}`
`53`	`53`	`resources {`
`54`	`54`	`excludes += ['LICENSE.txt']`
	`55`	`+ pickFirsts += ['net/i2p/i2ptunnel/resources/proxy/encp-header.ht']`
`55`	`56`	`}`
`56`	`57`	`}`
`57`	`58`	`flavorDimensions 'tier'`