Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21622 - servo:jdm-patch-20, r=SimonSapin

Browse source 
Make ndk-stack mach command support x86 builds.

Tested locally and it now provides usable output.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because no automated tests for build environment.

<!-- 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/21622)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-05 14:14:46 -04:00 • committed by GitHub
commit 3fec9100e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/devenv_commands.py
View file

@ -255,6 +255,7 @@ class MachCommands(CommandBase):
return -1 return -1
env = self.build_env(target=target) env = self.build_env(target=target)
ndk_stack = path.join(env["ANDROID_NDK"], "ndk-stack") ndk_stack = path.join(env["ANDROID_NDK"], "ndk-stack")
self.handle_android_target(target)
sym_path = path.join( sym_path = path.join(
"target", "target",
target, target,
@ -262,5 +263,5 @@ class MachCommands(CommandBase):
"apk", "apk",
"obj", "obj",
"local", "local",
"armeabi-v7a") self.config["android"]["lib"])
print(subprocess.check_output([ndk_stack, "-sym", sym_path, "-dump", logfile])) print(subprocess.check_output([ndk_stack, "-sym", sym_path, "-dump", logfile]))