summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--bitmask_android/build.gradle27
2 files changed, 25 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 1c3dea0a..c4d9ae2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ id.zip
/build-native.sh~
local.properties
+gradle.properties*
*~
*.iml
.idea
diff --git a/bitmask_android/build.gradle b/bitmask_android/build.gradle
index d59533ea..07ec7c1d 100644
--- a/bitmask_android/build.gradle
+++ b/bitmask_android/build.gradle
@@ -12,15 +12,36 @@ android {
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
+ signingConfigs {
+ release
+ }
+
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ signingConfig signingConfigs.release
}
}
+ if (project.hasProperty('storeFile')) {
+ signingConfigs.release.storeFile = new File(storeFile)
+ }
+
+ if (project.hasProperty('storePassword')) {
+ signingConfigs.release.storePassword = storePassword
+ }
+
+ if (project.hasProperty('keyAlias')) {
+ signingConfigs.release.keyAlias = keyAlias
+ }
+
+ if (project.hasProperty('keyPassword')) {
+ signingConfigs.release.keyPassword = keyPassword
+ }
+
lintOptions {
- abortOnError false
+ abortOnError false
}
sourceSets {
@@ -31,9 +52,9 @@ android {
jni.srcDirs = [] //disable automatic ndk-build
}
}
-}
+ }
dependencies {
androidTestCompile 'com.android.support:support-v4:+'
androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
-}
+} \ No newline at end of file