Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-01 20:43:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21071 - jdm:mozjs-android, r=ajeffrey

Browse source 
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 -->
This commit is contained in:
bors-servo 2018-06-19 20:25:27 -04:00 • committed by GitHub
commit 132bf17e87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/build_commands.py
View file

@ -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"]