From 131a0559265944ec4d7ee48085d4fffacd2e9d15 Mon Sep 17 00:00:00 2001 From: librelois Date: Mon, 22 Feb 2021 00:10:39 +0100 Subject: [PATCH] Revert "build(dubp): build for armv7 with old arm target" This reverts commit 0ed59cba2ee3ab1f85ec021686fd25ff83294688. --- Makefile.toml | 6 +++--- packages/dubp_rs/README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 9914fcd..c468104 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -159,7 +159,7 @@ run_task = "android-build" [tasks.android-armv7] private = true condition = { env_true = ["DEV"] } -env = { ANDROID_TARGET = "arm-linux-androideabi" } +env = { ANDROID_TARGET = "armv7-linux-androideabi" } run_task = "android-build" [tasks.android-i686] @@ -183,7 +183,7 @@ run_task = "android-build-release" [tasks.android-armv7-release] private = true condition = { env_true = ["RELEASE"] } -env = { ANDROID_TARGET = "arm-linux-androideabi" } +env = { ANDROID_TARGET = "armv7-linux-androideabi" } run_task = "android-build-release" [tasks.android-i686-release] @@ -227,7 +227,7 @@ run_task = "copy-lib" [tasks.post-android-armv7] private = true -env = { ANDROID_TARGET = "arm-linux-androideabi", JNI_LIB_DIR = "armeabi-v7a" } +env = { ANDROID_TARGET = "armv7-linux-androideabi", JNI_LIB_DIR = "armeabi-v7a" } run_task = "copy-lib" [tasks.post-android-i686] diff --git a/packages/dubp_rs/README.md b/packages/dubp_rs/README.md index a16b533..2c27fe8 100644 --- a/packages/dubp_rs/README.md +++ b/packages/dubp_rs/README.md @@ -21,7 +21,7 @@ For example: You will also need to add targets for all Android architectures: ```sh -rustup target add aarch64-linux-android arm-linux-androideabi x86_64-linux-android i686-linux-android +rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android ``` If you develop on mac, you can also add targets for iOS: