new android port: update fakeld

This commit is contained in:
Paul Rouget 2018-07-02 16:14:05 +08:00
parent be6b5f9aad
commit 76d394eca8
7 changed files with 10 additions and 11 deletions

View file

@ -1,17 +1,17 @@
[target.arm-linux-androideabi]
linker = "./ports/servo/fake-ld-arm.sh"
linker = "./support/android/fakeld/fake-ld-arm.sh"
ar = "arm-linux-androideabi-ar"
[target.armv7-linux-androideabi]
linker = "./ports/servo/fake-ld-armv7.sh"
linker = "./support/android/fakeld/fake-ld-armv7.sh"
ar = "arm-linux-androideabi-ar"
[target.aarch64-linux-android]
linker = "./ports/servo/fake-ld-arm64.sh"
linker = "./support/android/fakeld/fake-ld-arm64.sh"
ar = "aarch64-linux-android-ar"
[target.i686-linux-android]
linker = "./ports/servo/fake-ld-x86.sh"
linker = "./support/android/fakeld/fake-ld-x86.sh"
ar = "i686-linux-android-ar"
[target.arm-unknown-linux-gnueabihf]
@ -23,4 +23,4 @@ linker = "aarch64-linux-gnu-gcc"
ar = "aarch64-linux-gnu-ar"
[target.'cfg(target_os=windows)']
linker = "./ports/servo/fake-ld.cmd"
linker = "./support/android/fakeld/fake-ld.cmd"

View file

@ -8,7 +8,7 @@ set -o errexit
set -o nounset
set -o pipefail
source ./ports/servo/fake-ld.sh
source ./support/android/fakeld/fake-ld.sh
export _GCC_PARAMS="${@}"
call_gcc "arch-arm" "arm-linux-androideabi" "android-18" "armeabi" \

View file

@ -8,7 +8,7 @@ set -o errexit
set -o nounset
set -o pipefail
source ./ports/servo/fake-ld.sh
source ./support/android/fakeld/fake-ld.sh
export _GCC_PARAMS="${@}"
call_gcc "arch-arm64" "aarch64-linux-android" "android-21" "arm64-v8a"

View file

@ -8,7 +8,7 @@ set -o errexit
set -o nounset
set -o pipefail
source ./ports/servo/fake-ld.sh
source ./support/android/fakeld/fake-ld.sh
export _GCC_PARAMS="${@}"
call_gcc "arch-arm" "arm-linux-androideabi" "android-18" "armeabi-v7a" \

View file

@ -8,7 +8,7 @@ set -o errexit
set -o nounset
set -o pipefail
source ./ports/servo/fake-ld.sh
source ./support/android/fakeld/fake-ld.sh
export _GCC_PARAMS="${@}"
call_gcc "arch-x86" "x86" "android-18" "x86" "i686-linux-android"

View file

@ -33,6 +33,5 @@ call_gcc()
echo "targetdir: ${ANDROID_CXX_LIBS}"
"${ANDROID_TOOLCHAIN}/$5-gcc" \
--sysroot="${ANDROID_SYSROOT}" -L "${ANDROID_CXX_LIBS}" ${_GCC_PARAMS} -lc++ \
-o "${TARGET_DIR}/libservo.so" -shared && touch "${TARGET_DIR}/servo"
--sysroot="${ANDROID_SYSROOT}" -L "${ANDROID_CXX_LIBS}" ${_GCC_PARAMS} -lc++
}