Commit 833b35e7 authored by Mygod's avatar Mygod

Fix output name second attempt

parent c5ce702d
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
branch = shadowsocks-android branch = shadowsocks-android
[submodule "core/src/main/rust/shadowsocks-rust"] [submodule "core/src/main/rust/shadowsocks-rust"]
path = core/src/main/rust/shadowsocks-rust path = core/src/main/rust/shadowsocks-rust
url = https://github.com/madeye/shadowsocks-rust url = https://github.com/shadowsocks/shadowsocks-rust.git
...@@ -50,7 +50,8 @@ cargo { ...@@ -50,7 +50,8 @@ cargo {
"local-flow-stat", "local-flow-stat",
"local-dns-relay")) "local-dns-relay"))
exec = { spec, toolchain -> exec = { spec, toolchain ->
spec.environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-o,target/${toolchain.target}/$profile/lib$libname.so") spec.environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY", "$projectDir/$module/../linker-wrapper.py")
spec.environment("RUST_ANDROID_GRADLE_TARGET", "target/${toolchain.target}/$profile/lib$libname.so")
} }
} }
......
from __future__ import absolute_import, print_function, unicode_literals
import os
import pipes
import shutil
import subprocess
import sys
args = [os.environ['RUST_ANDROID_GRADLE_CC'], os.environ['RUST_ANDROID_GRADLE_CC_LINK_ARG']] + sys.argv[1:]
# This only appears when the subprocess call fails, but it's helpful then.
printable_cmd = ' '.join(pipes.quote(arg) for arg in args)
print(printable_cmd)
code = subprocess.call(args)
if code == 0:
shutil.copyfile(sys.argv[sys.argv.index('-o') + 1], os.environ['RUST_ANDROID_GRADLE_TARGET'])
sys.exit(code)
Subproject commit 246b6c48bce6d4a83af046bd3feb4843f772b9d2 Subproject commit 45a3469840fa423cecec90de5cc03ed5003c1a92
...@@ -21,6 +21,6 @@ dependencies { ...@@ -21,6 +21,6 @@ dependencies {
implementation("com.google.zxing:core:3.4.0") implementation("com.google.zxing:core:3.4.0")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4") implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4")
implementation("me.zhanghai.android.fastscroll:library:1.1.2") implementation("me.zhanghai.android.fastscroll:library:1.1.3")
implementation("xyz.belvi.mobilevision:barcodescanner:2.0.3") implementation("xyz.belvi.mobilevision:barcodescanner:2.0.3")
} }
rootProject.extra.apply { rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-alpha07") set("androidPlugin", "com.android.tools.build:gradle:4.1.0-alpha08")
set("kotlinVersion", "1.3.72") set("kotlinVersion", "1.3.72")
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment