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 | |
| 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 -->
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index c6a22873e87..8fca3b0d720 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1801,13 +1801,13 @@ dependencies = [ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs_sys 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mozjs_sys 0.51.2 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mozjs_sys" -version = "0.51.1" +version = "0.51.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bindgen 0.36.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3858,7 +3858,7 @@ dependencies = [ "checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f" "checksum mozangle 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1f0583e6792917f498bb3a7440f777a59353102063445ab7f5e9d1dc4ed593aa" "checksum mozjs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c9c59044218be40e6f412b32e845ce841f34e7d7bfc532ac046fcc5720152e55" -"checksum mozjs_sys 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a64b67dfd2d9b4bb084c9581db10dfe7e7b8b04b86612cdddd1aec26cf1d11f3" +"checksum mozjs_sys 0.51.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9e169fe5b3c63c4de27dc0cb9902f9f317b39683631f0f81d7dc3196f725454c" "checksum mp3-metadata 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ab5f1d2693586420208d1200ce5a51cd44726f055b635176188137aff42c7de" "checksum mp4parse 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f821e3799bc0fd16d9b861fb02fa7ee1b5fba29f45ad591dade105c48ca9a1a0" "checksum net2 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)" = "bc01404e7568680f1259aa5729539f221cb1e6d047a0d9053cab4be8a73b5d67" 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"] |