diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 9aae8e31320..63b7ebd19fd 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -306,6 +306,9 @@ class MachCommands(CommandBase): "-I" + cxx_include, "-I" + cxxabi_include]) env["NDK_ANDROID_VERSION"] = android_platform.replace("android-", "") + env['CPPFLAGS'] = ' '.join(["--sysroot", env['ANDROID_SYSROOT']]) + env["CMAKE_ANDROID_ARCH_ABI"] = self.config["android"]["lib"] + env["CMAKE_TOOLCHAIN_FILE"] = path.join(self.android_support_dir(), "toolchain.cmake") cargo_binary = "cargo" + BIN_SUFFIX diff --git a/support/android/toolchain.cmake b/support/android/toolchain.cmake new file mode 100644 index 00000000000..e961756d930 --- /dev/null +++ b/support/android/toolchain.cmake @@ -0,0 +1,4 @@ +set(CMAKE_SYSTEM_NAME Android) +set(CMAKE_ANDROID_NDK $ENV{ANDROID_NDK}) +set(CMAKE_ANDROID_API $ENV{NDK_ANDROID_VERSION}) +set(CMAKE_ANDROID_ARCH_ABI $ENV{CMAKE_ANDROID_ARCH_ABI})