From 58b201d43e7f5f96d99f38b6cc3e4d0859aadbe2 Mon Sep 17 00:00:00 2001 From: tigercosmos Date: Fri, 10 Nov 2017 21:57:41 +0800 Subject: [PATCH] enhance android build debug info --- python/servo/build_commands.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 3c5f6d4672e6..2ec27f00364c 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -248,6 +248,13 @@ def build(self, target=None, release=False, dev=False, jobs=None, env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions" if android: + if "ANDROID_NDK" not in os.environ: + print("Please set the ANDROID_NDK environment variable.") + sys.exit(1) + if "ANDROID_SDK" not in os.environ: + print("Please set the ANDROID_SDK environment variable.") + sys.exit(1) + android_platform = self.config["android"]["platform"] android_toolchain = self.config["android"]["toolchain_name"] android_arch = "arch-" + self.config["android"]["arch"] @@ -265,6 +272,10 @@ def build(self, target=None, release=False, dev=False, jobs=None, shutil.copy(path.join(self.android_support_dir(), "openssl.sh"), openssl_dir) # Check if the NDK version is 12 + if not os.path.isfile(path.join(env["ANDROID_NDK"], 'source.properties')): + print("ANDROID_NDK should have file `source.properties`.") + print("The environment variable ANDROID_NDK may be set at a wrong path.") + sys.exit(1) with open(path.join(env["ANDROID_NDK"], 'source.properties')) as ndk_properties: lines = ndk_properties.readlines() if lines[1].split(' = ')[1].split('.')[0] != '12':