aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.cargo/config10
-rwxr-xr-xsupport/android/fakeld/fake-ld-arm.sh (renamed from ports/servo/fake-ld-arm.sh)2
-rwxr-xr-xsupport/android/fakeld/fake-ld-arm64.sh (renamed from ports/servo/fake-ld-arm64.sh)2
-rwxr-xr-xsupport/android/fakeld/fake-ld-armv7.sh (renamed from ports/servo/fake-ld-armv7.sh)2
-rwxr-xr-xsupport/android/fakeld/fake-ld-x86.sh (renamed from ports/servo/fake-ld-x86.sh)2
-rw-r--r--support/android/fakeld/fake-ld.cmd (renamed from ports/servo/fake-ld.cmd)0
-rwxr-xr-xsupport/android/fakeld/fake-ld.sh (renamed from ports/servo/fake-ld.sh)3
7 files changed, 10 insertions, 11 deletions
diff --git a/.cargo/config b/.cargo/config
index 374ecf7ff53..18115efa62c 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -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" \ No newline at end of file
+linker = "./support/android/fakeld/fake-ld.cmd"
diff --git a/ports/servo/fake-ld-arm.sh b/support/android/fakeld/fake-ld-arm.sh
index 591e18b5fc3..e0ad523b023 100755
--- a/ports/servo/fake-ld-arm.sh
+++ b/support/android/fakeld/fake-ld-arm.sh
@@ -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" \
diff --git a/ports/servo/fake-ld-arm64.sh b/support/android/fakeld/fake-ld-arm64.sh
index 7a59ebb697f..aad8ca0810b 100755
--- a/ports/servo/fake-ld-arm64.sh
+++ b/support/android/fakeld/fake-ld-arm64.sh
@@ -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"
diff --git a/ports/servo/fake-ld-armv7.sh b/support/android/fakeld/fake-ld-armv7.sh
index de994982ffe..824ae24778b 100755
--- a/ports/servo/fake-ld-armv7.sh
+++ b/support/android/fakeld/fake-ld-armv7.sh
@@ -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" \
diff --git a/ports/servo/fake-ld-x86.sh b/support/android/fakeld/fake-ld-x86.sh
index a90671671ab..2f01846d42f 100755
--- a/ports/servo/fake-ld-x86.sh
+++ b/support/android/fakeld/fake-ld-x86.sh
@@ -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"
diff --git a/ports/servo/fake-ld.cmd b/support/android/fakeld/fake-ld.cmd
index b13c7e818ab..b13c7e818ab 100644
--- a/ports/servo/fake-ld.cmd
+++ b/support/android/fakeld/fake-ld.cmd
diff --git a/ports/servo/fake-ld.sh b/support/android/fakeld/fake-ld.sh
index 056a509abcc..c5c3445c6f7 100755
--- a/ports/servo/fake-ld.sh
+++ b/support/android/fakeld/fake-ld.sh
@@ -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++
}