ndk-stack command doesn't understand android target directory

[jdm]

When I have a build done with --android, I have target/android/armv7-linux-androideabi/debug/.... The ndk-stack command looks for target/armv7-linux-androideabi/..., so that it can support x86 android builds done with --target i686-linux-android.

[highfive]

cc @wafflespeanut

[jdm]

servo/python/servo/devenv_commands.py

Lines 236 to 258 in 834d319

	@Command('ndk-stack',
	description='Invoke the ndk-stack tool with the expected symbol paths',
	category='devenv')
	@CommandArgument('--release', action='store_true', help="Use release build symbols")
	@CommandArgument('--target', action='store', default="armv7-linux-androideabi",
	help="Build target")
	@CommandArgument('logfile', action='store', help="Path to logcat output with crash report")
	def stack(self, release, target, logfile):
	if not path.isfile(logfile):
	print(logfile + " doesn't exist")
	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,
	"release" if release else "debug",
	"apk",
	"obj",
	"local",
	self.config["android"]["lib"])
	print(subprocess.check_output([ndk_stack, "-sym", sym_path, "-dump", logfile]))