update submodule path and submodule branch
This commit is contained in:
parent
df82d624be
commit
a2fd6e6468
|
@ -1,4 +1,4 @@
|
|||
[submodule "lokinet_lib/external/loki-network"]
|
||||
path = lokinet_lib/external/loki-network
|
||||
url = https://github.com/oxen-io/loki-network
|
||||
branch = dev
|
||||
[submodule "lokinet_lib/external/lokinet"]
|
||||
path = lokinet_lib/external/lokinet
|
||||
url = https://github.com/oxen-io/lokinet
|
||||
branch = stable
|
||||
|
|
|
@ -74,17 +74,17 @@ dependencies {
|
|||
}
|
||||
|
||||
task cleanNativeLibs(type: Delete) {
|
||||
delete "$projectDir/../external/loki-network/build-android"
|
||||
delete "$projectDir/../external/lokinet/build-android"
|
||||
}
|
||||
|
||||
task compileNativeLibs(type: Exec) {
|
||||
workingDir "$projectDir/../external/loki-network"
|
||||
workingDir "$projectDir/../external/lokinet"
|
||||
environment "NDK", project.android.ndkDirectory
|
||||
executable "./contrib/android.sh"
|
||||
}
|
||||
|
||||
task ensureNativeLibs(type: Copy) {
|
||||
from("$projectDir/../external/loki-network/") {
|
||||
from("$projectDir/../external/lokinet/") {
|
||||
include 'lokinet-jni-*/*/*.so'
|
||||
eachFile { fcd ->
|
||||
fcd.relativePath = new RelativePath(true, fcd.relativePath.segments.drop(1))
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4723b532eb85784e0e643fcd2233253a8e775fc1
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 44ad8ad3dd8fe8a798e647c6d78ab1bdaedfbbf7
|
Loading…
Reference in New Issue