tmp

servo · May 23, 2018 · 3d641e8 · 3d641e8
1 parent 7567ac6
commit 3d641e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
@@ -295,15 +295,15 @@ def build(self, target=None, release=False, dev=False, jobs=None,
                     sys.exit(1)
 
             env["RUST_TARGET"] = target
-            env["ANDROID_TOOLCHAIN_NAME"] = self.config['android']['toolchain']
+            env["ANDROID_TOOLCHAIN_NAME"] = self.config['android']['JDMtoolchain']
             with cd(openssl_dir):
                 status = call(
                     make_cmd + ["-f", "openssl.makefile"],
                     env=env,
                     verbose=verbose)
                 if status:
                     return status
-            env["ANDROID_TOOLCHAIN_NAME"] = None
+            del env["ANDROID_TOOLCHAIN_NAME"]
             openssl_dir = path.join(openssl_dir, "openssl-{}".format(env["OPENSSL_VERSION"]))
             env['OPENSSL_LIB_DIR'] = openssl_dir
             env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -607,31 +607,31 @@ def handle_android_target(self, target):
         if target == "arm-linux-androideabi":
             self.config["android"]["platform"] = "android-18"
             self.config["android"]["target"] = target
-            self.config["android"]["toolchain"] = target
+            self.config["android"]["JDMtoolchain"] = target
             self.config["android"]["arch"] = "arm"
             self.config["android"]["lib"] = "armeabi"
             self.config["android"]["toolchain_name"] = target + "-4.9"
             return True
         elif target == "armv7-linux-androideabi":
             self.config["android"]["platform"] = "android-18"
             self.config["android"]["target"] = target
-            self.config["android"]["toolchain"] = "arm-linux-androideabi"
+            self.config["android"]["JDMtoolchain"] = "arm-linux-androideabi"
             self.config["android"]["arch"] = "arm"
             self.config["android"]["lib"] = "armeabi-v7a"
             self.config["android"]["toolchain_name"] = "arm-linux-androideabi-4.9"
             return True
         elif target == "aarch64-linux-android":
             self.config["android"]["platform"] = "android-21"
             self.config["android"]["target"] = target
-            self.config["android"]["toolchain"] = target
+            self.config["android"]["JDMtoolchain"] = target
             self.config["android"]["arch"] = "arm64"
             self.config["android"]["lib"] = "arm64-v8a"
             self.config["android"]["toolchain_name"] = target + "-4.9"
             return True
         elif target == "i686-linux-android":
             self.config["android"]["platform"] = "android-18"
             self.config["android"]["target"] = target
-            self.config["android"]["toolchain"] = "x86"
+            self.config["android"]["JDMtoolchain"] = "x86"
             self.config["android"]["arch"] = "x86"
             self.config["android"]["lib"] = "x86"
             self.config["android"]["toolchain_name"] = "x86-4.9"