cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix debug/release build separation

Browse Source
This commit is contained in:
Dominik Schürmann
2015-06-11 00:31:41 +02:00
parent d16b09b2a6
commit 6749b03d9a
16 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenKeychain/build.gradle
View File

@@ -12,7 +12,7 @@ dependencies {
compile 'com.android.support:cardview-v7:22.1.0'
// Local Unit tests with Robolectric
// https://developer.android.com/training/testing/unit-testing/local-unit-tests.html#run
// https://developer.android.com/training/testing/unit-testing/local-unit-tests.html
// https://github.com/nenick/AndroidStudioAndRobolectric
// http://www.vogella.com/tutorials/Robolectric/article.html
testCompile 'junit:junit:4.12'
@@ -126,40 +126,20 @@ android {
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.account\""
buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.provider\""
buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.tempstorage\""
// Reference them in .xml files.
resValue "string", "account_type", "org.sufficientlysecure.keychain.account"
resValue "string", "provider_authority", "org.sufficientlysecure.keychain.provider"
resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.tempstorage"
}
debug {
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.account\""
buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.provider\""
buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.tempstorage\""
// Reference them in .xml files.
resValue "string", "account_type", "org.sufficientlysecure.keychain.account"
resValue "string", "provider_authority", "org.sufficientlysecure.keychain.provider"
resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.tempstorage"
}
/*extra {
applicationIdSuffix ".debug"
// Reference them in the java files with e.g. BuildConfig.ACCOUNT_TYPE.
buildConfigField "String", "ACCOUNT_TYPE", "\"org.sufficientlysecure.keychain.debug.account\""
buildConfigField "String", "PROVIDER_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.provider\""
buildConfigField "String", "TEMPSTORAGE_AUTHORITY", "\"org.sufficientlysecure.keychain.debug.tempstorage\""
// Reference them in .xml files.
resValue "string", "account_type", "org.sufficientlysecure.keychain.debug.account"
resValue "string", "provider_authority", "org.sufficientlysecure.keychain.debug.provider"
resValue "string", "tempstorage_authority", "org.sufficientlysecure.keychain.debug.tempstorage"
}*/
}
}
/*
@@ -210,12 +190,6 @@ android {
exclude 'LICENSE.txt'
}
}
// workaround?
//tasks.withType(Test).whenTaskAdded {
// project.android.defaultConfig.applicationId 'org.sufficientlysecure.keychain'
//}
// NOTE: This disables Lint!
tasks.whenTaskAdded { task ->