diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2018-06-26 19:13:01 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2018-07-02 13:25:44 +0200 |
| commit | b7a8b81071e91fa466d40f6060197d495e55d5f5 (patch) | |
| tree | 50cd41a8f7f363a21142c19bb0a43f6e3a1a18cd | |
| parent | 7d7f2025b7bf4c42dfa085ae34fba9f80b4e40a7 (diff) | |
| download | servo-b7a8b81071e91fa466d40f6060197d495e55d5f5.tar.gz servo-b7a8b81071e91fa466d40f6060197d495e55d5f5.zip | |
egl-configs: add i686 support
| -rw-r--r-- | support/android/egl-configs/.cargo/config | 6 | ||||
| -rwxr-xr-x | support/android/egl-configs/ld-i686.sh | 16 |
2 files changed, 21 insertions, 1 deletions
diff --git a/support/android/egl-configs/.cargo/config b/support/android/egl-configs/.cargo/config index 1f0c80724a2..800226ab108 100644 --- a/support/android/egl-configs/.cargo/config +++ b/support/android/egl-configs/.cargo/config @@ -1,6 +1,10 @@ [build] -target = "armv7-linux-androideabi" +target = "i686-linux-android" [target.armv7-linux-androideabi] linker = "./ld.sh" runner = "./run.sh" + +[target.i686-linux-android] +linker = "./ld-i686.sh" +runner = "./run.sh" diff --git a/support/android/egl-configs/ld-i686.sh b/support/android/egl-configs/ld-i686.sh new file mode 100755 index 00000000000..37b1dadd64e --- /dev/null +++ b/support/android/egl-configs/ld-i686.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +set -o errexit +set -o nounset +set -o pipefail + +NDK=../../../android-toolchains/android-ndk-r12b-linux-x86_64/android-ndk-r12b +BIN="${NDK}/toolchains/x86-4.9/prebuilt/linux-x86_64/bin/" + +"${BIN}/i686-linux-android-gcc" \ + --sysroot "${NDK}/platforms/android-18/arch-x86" \ + "${@}" |