aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-05-23 11:53:39 -0400
committerGitHub <noreply@github.com>2018-05-23 11:53:39 -0400
commit521748c01e0a932ecb7d6801732e2a5cc516903e (patch)
tree390511314b6f819ee65da2c23acb34e5265a2ffd /python
parent687459a726cfcb42bc4a6b77891e6e1cf79d7aaf (diff)
parentd6b8aaf576364a622f0ce637d3239c551750ca02 (diff)
downloadservo-521748c01e0a932ecb7d6801732e2a5cc516903e.tar.gz
servo-521748c01e0a932ecb7d6801732e2a5cc516903e.zip
Auto merge of #20472 - jdm:android-x86-2, r=mbrubeck
Support i686-linux-android target for android-x86 emulator The first commit allows `./mach build --target=i686-linux-android` to build successfully. The second commit is temporary as I attempt to find the cause of the mysterious crash that takes down the browser. <!-- 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/20472) <!-- Reviewable:end -->
Diffstat (limited to 'python')
-rw-r--r--python/servo/build_commands.py1
-rw-r--r--python/servo/command_base.py11
-rw-r--r--python/servo/package_commands.py2
3 files changed, 14 insertions, 0 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 1977cf78d4a..1e02061fe5f 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -295,6 +295,7 @@ class MachCommands(CommandBase):
sys.exit(1)
env["RUST_TARGET"] = target
+ env["ANDROID_TOOLCHAIN_NAME"] = self.config["android"]["toolchain_prefix"]
with cd(openssl_dir):
status = call(
make_cmd + ["-f", "openssl.makefile"],
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 32870474666..d6b38c35156 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -607,6 +607,7 @@ class CommandBase(object):
if target == "arm-linux-androideabi":
self.config["android"]["platform"] = "android-18"
self.config["android"]["target"] = target
+ self.config["android"]["toolchain_prefix"] = target
self.config["android"]["arch"] = "arm"
self.config["android"]["lib"] = "armeabi"
self.config["android"]["toolchain_name"] = target + "-4.9"
@@ -614,6 +615,7 @@ class CommandBase(object):
elif target == "armv7-linux-androideabi":
self.config["android"]["platform"] = "android-18"
self.config["android"]["target"] = target
+ self.config["android"]["toolchain_prefix"] = "arm-linux-androideabi"
self.config["android"]["arch"] = "arm"
self.config["android"]["lib"] = "armeabi-v7a"
self.config["android"]["toolchain_name"] = "arm-linux-androideabi-4.9"
@@ -621,10 +623,19 @@ class CommandBase(object):
elif target == "aarch64-linux-android":
self.config["android"]["platform"] = "android-21"
self.config["android"]["target"] = target
+ self.config["android"]["toolchain_prefix"] = 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_prefix"] = "x86"
+ self.config["android"]["arch"] = "x86"
+ self.config["android"]["lib"] = "x86"
+ self.config["android"]["toolchain_name"] = "x86-4.9"
+ return True
return False
def ensure_bootstrapped(self, target=None):
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 8fb97e9eb70..c2820b114b5 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -200,6 +200,8 @@ class PackageCommands(CommandBase):
build_type = "Arm64"
elif "armv7" in android_target:
build_type = "Armv7"
+ elif "i686" in android_target:
+ build_type = "x86"
else:
build_type = "Arm"