diff --git a/core/build.gradle.kts b/core/build.gradle.kts index d175f7d0..92c44716 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -24,6 +24,7 @@ import com.android.ide.common.signing.KeystoreHelper import org.apache.commons.codec.binary.Hex import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.ReplaceTokens +import java.io.ByteArrayOutputStream import java.io.FileOutputStream import java.io.PrintStream import java.security.MessageDigest @@ -296,7 +297,16 @@ val pushLspd = task("pushLspd", Exec::class) { } val pushLspdNative = task("pushLspdNative", Exec::class) { dependsOn("mergeDebugNativeLibs") - workingDir("$buildDir/intermediates/merged_native_libs/debug/out/lib/arm64-v8a") + doFirst { + val abi: String = ByteArrayOutputStream().use { outputStream -> + exec { + commandLine(adb, "shell", "getprop", "ro.product.cpu.abi") + standardOutput = outputStream + } + outputStream.toString().trim() + } + workingDir("$buildDir/intermediates/merged_native_libs/debug/out/lib/$abi") + } commandLine(adb, "push", "libdaemon.so", "/data/local/tmp/libdaemon.so") } task("reRunLspd", Exec::class) {