summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle19
1 files changed, 15 insertions, 4 deletions
diff --git a/app/build.gradle b/app/build.gradle
index a57a2763..f2ddd9cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,12 @@ apply plugin: 'android'
android {
compileSdkVersion 19
- buildToolsVersion "19.1.0"
+ buildToolsVersion "20"
defaultConfig {
minSdkVersion 14
targetSdkVersion 19
- testPackageName "se.leap.bitmaskclient.test"
testInstrumentationRunner "android.test.InstrumentationTestRunner"
}
@@ -47,8 +46,9 @@ android {
}
dependencies {
- androidTestCompile 'com.android.support:support-v4:+'
- androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
+ // androidTestCompile 'com.android.support:support-v4:20+'
+ // androidTestCompile 'com.android.support:appcompat-v7:20.+'
+ androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.2.1'
compile 'com.intellij:annotations:12.0'
}
@@ -144,4 +144,15 @@ task mergeUntranslatable( type: Copy, dependsOn: 'removeDuplicatedStrings') {
delete ics_openvpn_untranslatable
}
+
+task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
+ from('../ics-openvpn-stripped/main') {
+ include 'openvpn/**'
+ include 'lzo/**'
+ include 'jni/**'
+ include 'misc/**'
+ include 'ovpn3/**'
+ include 'snappy/**'
+ } into '.'
+}
//build.dependsOn ':app:mergeUntranslatable' \ No newline at end of file