summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-06-04 23:29:47 +0200
committerParménides GV <parmegv@sdf.org>2015-06-04 23:29:47 +0200
commit3e849c7cbe847d9260dee7a29b241c8aef185f6d (patch)
tree5e54d8cc7ea06fdcf1aa88fd7fd54ec569a8b7a3
parent0b396ae4232a22cec67b21851ee2f4c374a94a92 (diff)
Update git submodules recursively from ./gradlew updateIcs
-rw-r--r--app/build.gradle15
1 files changed, 2 insertions, 13 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 7a03ceee..0f73442c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -185,19 +185,8 @@ task copyIcsOpenVPNFiles( type: Copy ) {
removeDuplicatedStrings.execute()
}
-task updateIcsOpenVpn( type: Copy ) {
- // Check out ics-openvpn bitmask branch
- def ics_openvpn_path = project.relativePath('./ics-openvpn/')
- def app_path = project.relativePath('./app/')
- def grgit = Grgit.open(currentDir: ics_openvpn_path)
- grgit.checkout(branch: 'bitmask')
- // TODO Right now we can't do a git submodule init,
- // DON'T FORGET TO DO IT FOR THE FIRST TIME
-
- // from ics_openvpn_path
- // into app_path
- // include('**/openvpn/**', '**/openssl/**', '**/lzo/**', '**/jni/**', '**/misc/**', '**/ovpn3/**', '**/snappy/**')
-
+task updateIcsOpenVpn( type: Exec ) {
+ commandLine 'git', 'submodule', 'update', '--init', '--recursive'
copyIcsOpenVPNFiles.execute()
}