diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-11 00:31:41 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-11 00:31:41 +0200 |
commit | 6749b03d9a7e0ab84934789adcb59d848ffb8b46 (patch) | |
tree | 6d1109f66a0067fdfd59c080ecec04c130951717 /OpenKeychain/build.gradle | |
parent | d16b09b2a6be41319b993c27e69b85067a7f1c46 (diff) | |
download | open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.tar.gz open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.tar.bz2 open-keychain-6749b03d9a7e0ab84934789adcb59d848ffb8b46.zip |
Fix debug/release build separation
Diffstat (limited to 'OpenKeychain/build.gradle')
-rw-r--r-- | OpenKeychain/build.gradle | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index e84c2107c..82c56f5c0 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -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 { + debug { 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 -> |