diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-06-19 20:25:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 20:25:27 -0400 |
| commit | 132bf17e871c09180d6df425478b55950e3d3324 (patch) | |
| tree | 5624f9bd7b80debca5efe7c9c16e87d2e3a02648 /python | |
| parent | 7f745139a773bd26838b0a2b7d992d8252ce4fed (diff) | |
| parent | 2544db1e79bac7234b4cfe54d1f5281954049ac1 (diff) | |
| download | servo-132bf17e871c09180d6df425478b55950e3d3324.tar.gz servo-132bf17e871c09180d6df425478b55950e3d3324.zip | |
Auto merge of #21071 - jdm:mozjs-android, r=ajeffrey
Update mozjs_sys to include cross-compilation fixes.
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #20958
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21071)
<!-- Reviewable:end -->
Diffstat (limited to 'python')
| -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"] |