diff options
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 1e02061fe5f..d48730252b2 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -330,14 +330,18 @@ class MachCommands(CommandBase): env['ANDROID_NDK'], "sources", "cxx-stl", "llvm-libc++", "libcxx", "include") cxxabi_include = path.join( env['ANDROID_NDK'], "sources", "cxx-stl", "llvm-libc++abi", "libcxxabi", "include") + sysroot_include = path.join( + env['ANDROID_SYSROOT'], "usr", "include") + env['HOST_CFLAGS'] = '' env['CFLAGS'] = ' '.join([ - "--sysroot", env['ANDROID_SYSROOT'], + "--sysroot=" + env['ANDROID_SYSROOT'], "-I" + support_include]) env['CXXFLAGS'] = ' '.join([ - "--sysroot", env['ANDROID_SYSROOT'], + "--sysroot=" + env['ANDROID_SYSROOT'], "-I" + support_include, "-I" + cxx_include, - "-I" + cxxabi_include]) + "-I" + cxxabi_include, + "-I" + sysroot_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"] |