From 3f10c874e47ed908eece0dd7f0663bf05d12eaf3 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 22 Jun 2018 15:29:11 -0400
Subject: [PATCH] almost linking

---
 ports/servo/fake-ld-armv7.sh   |  2 +-
 ports/servo/fake-ld.sh         | 11 ++++++-----
 python/servo/build_commands.py |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ports/servo/fake-ld-armv7.sh b/ports/servo/fake-ld-armv7.sh
index de994982ffec5..06d0c41ae8752 100755
--- a/ports/servo/fake-ld-armv7.sh
+++ b/ports/servo/fake-ld-armv7.sh
@@ -12,4 +12,4 @@ source ./ports/servo/fake-ld.sh
 
 export _GCC_PARAMS="${@}"
 call_gcc "arch-arm" "arm-linux-androideabi" "android-18" "armeabi-v7a" \
-         "arm-linux-androideabi"
+         "armv7-linux-androideabi"
diff --git a/ports/servo/fake-ld.sh b/ports/servo/fake-ld.sh
index 056a509abcc63..7e3ba9b0c3d3b 100755
--- a/ports/servo/fake-ld.sh
+++ b/ports/servo/fake-ld.sh
@@ -15,11 +15,12 @@ call_gcc()
   export _ANDROID_ARCH=$1
   export _ANDROID_EABI=$2
   export _ANDROID_PLATFORM=$3
+  export _ANDROID_TARGET=$5
   export ANDROID_SYSROOT="${ANDROID_NDK}/platforms/${_ANDROID_PLATFORM}/${_ANDROID_ARCH}"
   ANDROID_TOOLCHAIN=""
   for host in "linux-x86_64" "linux-x86" "darwin-x86_64" "darwin-x86"; do
-    if [[ -d "${ANDROID_NDK}/toolchains/${_ANDROID_EABI}-4.9/prebuilt/${host}/bin" ]]; then
-      ANDROID_TOOLCHAIN="${ANDROID_NDK}/toolchains/${_ANDROID_EABI}-4.9/prebuilt/${host}/bin"
+    if [[ -d "${ANDROID_NDK}/toolchains/llvm/prebuilt/${host}/bin" ]]; then
+      ANDROID_TOOLCHAIN="${ANDROID_NDK}/toolchains/llvm/prebuilt/${host}/bin"
       break
     fi
   done
@@ -32,7 +33,7 @@ call_gcc()
   echo "sysroot: ${ANDROID_SYSROOT}"
   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"
+  "${ANDROID_TOOLCHAIN}/clang" \
+    --sysroot="${ANDROID_SYSROOT}" --gcc-toolchain="${GCC_TOOLCHAIN}" -L "${ANDROID_CXX_LIBS}" ${_GCC_PARAMS} -lc++ \
+    -v -o "${TARGET_DIR}/libservo.so" --target="${_ANDROID_TARGET}" -shared && touch "${TARGET_DIR}/servo"
 }
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 9e7e6c7af4714..e00fd808d9342 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -348,6 +348,7 @@ def build(self, target=None, release=False, dev=False, jobs=None,
                 "prebuilt", host
             )
             env['ANDROID_TOOLCHAIN'] = gcc_toolchain
+            env['GCC_TOOLCHAIN'] = gcc_toolchain
             gcc_toolchain_bin = path.join(gcc_toolchain, self.config["android"]["toolchain_prefix"], "bin")
             env['AR'] = path.join(gcc_toolchain_bin, "ar")
             env['RANLIB'] = path.join(gcc_toolchain_bin, "ranlib")