diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-28 07:02:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 07:02:12 -0500 |
| commit | ae09fe490b6fb9b28c26d0f0be9a2b8f8121a2f6 (patch) | |
| tree | 4636f7fbf6a4bc85579d7917174e6e4c1c1f7147 /python/servo/command_base.py | |
| parent | 3f0643c1def19b1d0b38204c0ed483643d8cdb81 (diff) | |
| parent | 496a62860e04578ca2616940c28f036842e37bcb (diff) | |
| download | servo-ae09fe490b6fb9b28c26d0f0be9a2b8f8121a2f6.tar.gz servo-ae09fe490b6fb9b28c26d0f0be9a2b8f8121a2f6.zip | |
Auto merge of #22277 - servo:android, r=jdm
Put every Android build artefact in target/android/
This works around #20380 at the cost of rebuilding build-only dependencies twice,
once for normal builds and once for android builds.
<!-- 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/22277)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index e44336c39d1..277f1d3aac1 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -345,7 +345,7 @@ class CommandBase(object): def get_apk_path(self, release): base_path = self.get_target_dir() - base_path = path.join(base_path, self.config["android"]["target"]) + base_path = path.join(base_path, "android", self.config["android"]["target"]) apk_name = "servoapp.apk" build_type = "release" if release else "debug" return path.join(base_path, build_type, apk_name) @@ -361,10 +361,10 @@ class CommandBase(object): binary_name = "servo" + BIN_SUFFIX if magicleap: - base_path = path.join(base_path, "aarch64-linux-android") + base_path = path.join(base_path, "magicleap", "aarch64-linux-android") binary_name = "libmlservo.a" elif android: - base_path = path.join(base_path, self.config["android"]["target"]) + base_path = path.join(base_path, "android", self.config["android"]["target"]) binary_name = "libsimpleservo.so" release_path = path.join(base_path, "release", binary_name) @@ -700,11 +700,8 @@ install them, let us know by filing a bug!") def android_support_dir(self): return path.join(self.context.topdir, "support", "android") - def android_build_dir(self, dev): - return path.join(self.get_target_dir(), self.config["android"]["target"], "debug" if dev else "release") - def android_aar_dir(self): - return path.join(self.context.topdir, "target", "android_aar") + return path.join(self.context.topdir, "target", "android", "aar") def android_adb_path(self, env): if "ANDROID_SDK" in env: |