diff options
| author | Matthias Dressel <code@deadcode.eu> | 2022-08-30 23:17:08 +0300 |
|---|---|---|
| committer | Matthias Dressel <code@deadcode.eu> | 2022-09-09 10:20:52 +0300 |
| commit | aa3fda7800d4878da6ca42a180aaa524a424a602 (patch) | |
| tree | 273f822894963cd4b1c57f918c95336309a180ef | |
| parent | d92594bd5d06b40702b586d4d85d5426cd641fe4 (diff) | |
crossfiles: Update Android toolchains
* Android armv7: target API 19 since it's the lowest directly provided
by the new NDK.
* Newer NDK has generic tools for ar, strip, etc.
* Remove windres as it's only relevant for Windows targets.
| -rw-r--r-- | package/crossfiles/aarch64-android.meson | 5 | ||||
| -rw-r--r-- | package/crossfiles/arm-android.meson | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/crossfiles/aarch64-android.meson b/package/crossfiles/aarch64-android.meson index a25ea43..b3840b6 100644 --- a/package/crossfiles/aarch64-android.meson +++ b/package/crossfiles/aarch64-android.meson @@ -1,10 +1,9 @@ [binaries] c = 'aarch64-linux-android21-clang' cpp = 'aarch64-linux-android21-clang++' -ar = 'aarch64-linux-android-ar' -strip = 'aarch64-linux-android-strip' +ar = 'llvm-ar' +strip = 'llvm-strip' pkgconfig = 'pkg-config' -windres = 'aarch64-linux-android-windres' [properties] needs_exe_wrapper = true diff --git a/package/crossfiles/arm-android.meson b/package/crossfiles/arm-android.meson index dd07d98..8531566 100644 --- a/package/crossfiles/arm-android.meson +++ b/package/crossfiles/arm-android.meson @@ -1,10 +1,9 @@ [binaries] -c = 'armv7a-linux-androideabi16-clang' -cpp = 'armv7a-linux-androideabi16-clang++' -ar = 'arm-linux-androideabi-ar' -strip = 'arm-linux-androideabi-strip' +c = 'armv7a-linux-androideabi19-clang' +cpp = 'armv7a-linux-androideabi19-clang++' +ar = 'llvm-ar' +strip = 'llvm-strip' pkgconfig = 'pkg-config' -windres = 'arm-linux-androideabi-windres' [properties] needs_exe_wrapper = true |