diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-21 22:12:15 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-21 22:25:21 +0530 |
| commit | 7716ea303a7d6d68eddf7ce2e9202ffae39b0d9b (patch) | |
| tree | d7007352a26ebc6849bb150c2753e4b9025a3a02 /data | |
| parent | ee4108a0866d01c0cb675b9eb08c94fe9098b69c (diff) | |
| download | gstreamer-7716ea303a7d6d68eddf7ce2e9202ffae39b0d9b.tar.gz | |
cross-files/android: Update paths and args for latest NDK
-fuse-ld=gold was always needed, but we missed it while adding this.
The rest are new in NDK r21.
Diffstat (limited to 'data')
| -rw-r--r-- | data/cross-files/android_arm64_api28.txt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/data/cross-files/android_arm64_api28.txt b/data/cross-files/android_arm64_api28.txt index c697549a6e..7137fabd17 100644 --- a/data/cross-files/android_arm64_api28.txt +++ b/data/cross-files/android_arm64_api28.txt @@ -5,12 +5,16 @@ cpu = 'aarch64' endian = 'little' [properties] -c_args = ['--sysroot', '/opt/android-arm64-api28/sysroot'] -cpp_args = ['--sysroot', '/opt/android-arm64-api28/sysroot'] +sys_root = '/path/to/android-ndk-r21/sysroot' +c_link_args = ['-fuse-ld=gold'] +cpp_link_args = ['-fuse-ld=gold'] +# Starting with 0.53.1, you can replace the above *_link_args: +# c_ld = 'gold' +# cpp_ld = 'gold' [binaries] -c = '/opt/android-arm64-api28/bin/aarch64-linux-android-clang' -cpp = '/opt/android-arm64-api28/bin/aarch64-linux-android-clang++' -ar = '/opt/android-arm64-api28/bin/aarch64-linux-android-ar' -strip = '/opt/android-arm64-api28/bin/aarch64-linux-android-strip' +c = '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang' +cpp = '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang++' +ar = '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar' +strip = '/path/to/android-ndk-r21/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip' pkgconfig = 'false' |