mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-17 21:29:54 +01:00
Merge branch 'fix-screenshot-tests' into 'master'
Fix screenshot PromoVideoTest See merge request briar/briar!1594
This commit is contained in:
@@ -61,8 +61,9 @@ android {
|
|||||||
productFlavors {
|
productFlavors {
|
||||||
screenshot {
|
screenshot {
|
||||||
dimension "version"
|
dimension "version"
|
||||||
minSdkVersion 18
|
minSdkVersion 21
|
||||||
applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
|
applicationIdSuffix ".screenshot" // = org.briarproject.briar.android.screenshot.debug
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt', 'proguard-test.txt'
|
||||||
}
|
}
|
||||||
official {
|
official {
|
||||||
dimension "version"
|
dimension "version"
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
-keep,includedescriptorclasses class org.briarproject.bramble.** { *; }
|
||||||
|
-keep,includedescriptorclasses class org.briarproject.briar.** { *; }
|
||||||
|
|
||||||
-dontwarn android.test.**
|
-dontwarn android.test.**
|
||||||
-dontwarn android.support.test.**
|
-dontwarn android.support.test.**
|
||||||
-dontnote android.support.test.**
|
-dontnote android.support.test.**
|
||||||
|
|||||||
Reference in New Issue
Block a user