summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-08 15:37:15 +0100
committercyBerta <cyberta@riseup.net>2018-02-08 15:37:15 +0100
commit6770f041300fa592dfb93fb4296c55218c05cc45 (patch)
tree17dd25e0b17e50358cef4e464fa4bc2503cc2859 /app/build.gradle
parentef805faec61a4cb3155dd336f5db08cd2c40aece (diff)
parentae938c20a11b6195936f97eebd32abd35335bceb (diff)
Merge branch 'mirror_0xacab_0.9.8' into #8830_onBoot_alwaysOn
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/build.gradle b/app/build.gradle
index c909b70f..3e4862ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,6 +118,7 @@ dependencies {
implementation 'com.android.support:design:27.0.2'
implementation 'com.android.support:support-fragment:27.0.2'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation 'com.android.support:multidex:1.0.2'
}
// Ensure the no-op dependency is always used in JVM tests.
@@ -153,11 +154,6 @@ task copyIcsOpenVPNClasses( type: Copy ) {
include '**/LogWindow.java'
include '**/LogFragment.java'
include '**/SeekBarTicks.java'
- include '**/log_window.xml'
- include '**/log_fragment.xml'
- include '**/log_silders.xml'
- include '**/vpnstatus.xml'
- include '**/logmenu.xml'
include '**/core/**.java'
include '**/activities/BaseActivity.java'
include '**/APIVpnProfile.java'
@@ -181,6 +177,11 @@ task copyIcsOpenVPNClasses( type: Copy ) {
task copyIcsOpenVPNXml( type: Copy ) {
println "copyIcsOpenVPNXml"
from ('../ics-openvpn/main/') {
+ include '**/log_window.xml'
+ include '**/log_fragment.xml'
+ include '**/log_silders.xml'
+ include '**/vpnstatus.xml'
+ include '**/logmenu.xml'
include '**/strings.xml'
include '**/log_*.xml'
include '**/vpnstatus.xml'