From a19cedfddcb91827e7509acb5d6a736b242bc360 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 5 Sep 2018 12:52:50 -0400
Subject: [PATCH] Make ndk-stack mach command support x86 builds.

---
 python/servo/devenv_commands.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py
index 31bfc8f48bd..9852558bce6 100644
--- a/python/servo/devenv_commands.py
+++ b/python/servo/devenv_commands.py
@@ -255,6 +255,7 @@ class MachCommands(CommandBase):
             return -1
         env = self.build_env(target=target)
         ndk_stack = path.join(env["ANDROID_NDK"], "ndk-stack")
+        self.handle_android_target(target)
         sym_path = path.join(
             "target",
             target,
@@ -262,5 +263,5 @@ class MachCommands(CommandBase):
             "apk",
             "obj",
             "local",
-            "armeabi-v7a")
+            self.config["android"]["lib"])
         print(subprocess.check_output([ndk_stack, "-sym", sym_path, "-dump", logfile]))