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 -->

3 files changed, 38 insertions, 34 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index f486515560f..a6c1e59199b 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -207,7 +207,29 @@ class MachCommands(CommandBase):
             android = self.config["build"]["android"]
         features = features or self.servo_features()
 
-        base_path = self.get_target_dir()
+        if target and android:
+            print("Please specify either --target or --android.")
+            sys.exit(1)
+
+        if android:
+            target = self.config["android"]["target"]
+
+        if not magicleap:
+            features += ["native-bluetooth"]
+
+        if magicleap and not target:
+            target = "aarch64-linux-android"
+
+        if target and not android and not magicleap:
+            android = self.handle_android_target(target)
+
+        target_path = base_path = self.get_target_dir()
+        if android:
+            target_path = path.join(target_path, "android")
+            base_path = path.join(target_path, target)
+        elif magicleap:
+            target_path = path.join(target_path, "magicleap")
+            base_path = path.join(target_path, target)
         release_path = path.join(base_path, "release", "servo")
         dev_path = path.join(base_path, "debug", "servo")
 
@@ -232,10 +254,6 @@ class MachCommands(CommandBase):
             print("Please specify either --dev or --release.")
             sys.exit(1)
 
-        if target and android:
-            print("Please specify either --target or --android.")
-            sys.exit(1)
-
         if release:
             opts += ["--release"]
             servo_path = release_path
@@ -249,15 +267,6 @@ class MachCommands(CommandBase):
         if very_verbose:
             opts += ["-vv"]
 
-        if android:
-            target = self.config["android"]["target"]
-
-        if not magicleap:
-            features += ["native-bluetooth"]
-
-        if magicleap and not target:
-            target = "aarch64-linux-android"
-
         if target:
             if self.config["tools"]["use-rustup"]:
                 # 'rustup target add' fails if the toolchain is not installed at all.
@@ -267,8 +276,6 @@ class MachCommands(CommandBase):
                             "--toolchain", self.toolchain(), target])
 
             opts += ["--target", target]
-            if not android and not magicleap:
-                android = self.handle_android_target(target)
 
         self.ensure_bootstrapped(target=target)
         self.ensure_clobbered()
@@ -288,6 +295,7 @@ class MachCommands(CommandBase):
 
         build_start = time()
         env = self.build_env(target=target, is_build=True)
+        env["CARGO_TARGET_DIR"] = target_path
 
         if with_debug_assertions:
             env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"
@@ -314,8 +322,7 @@ class MachCommands(CommandBase):
             make_cmd = ["make"]
             if jobs is not None:
                 make_cmd += ["-j" + jobs]
-            android_dir = self.android_build_dir(dev)
-            openssl_dir = path.join(android_dir, "native", "openssl")
+            openssl_dir = path.join(target_path, target, "native", "openssl")
             if not path.exists(openssl_dir):
                 os.makedirs(openssl_dir)
             shutil.copy(path.join(self.android_support_dir(), "openssl.makefile"), openssl_dir)
@@ -435,8 +442,8 @@ class MachCommands(CommandBase):
             # according to the build target.
             gst_lib = "gst-build-{}".format(self.config["android"]["lib"])
             gst_lib_zip = "gstreamer-{}-1.14.3-20181105-103937.zip".format(self.config["android"]["lib"])
-            gst_dir = os.path.join(base_path, "gstreamer")
-            gst_lib_path = os.path.join(base_path, gst_dir, gst_lib)
+            gst_dir = os.path.join(target_path, "gstreamer")
+            gst_lib_path = os.path.join(gst_dir, gst_lib)
             pkg_config_path = os.path.join(gst_lib_path, "pkgconfig")
             env["PKG_CONFIG_PATH"] = pkg_config_path
             if not os.path.exists(gst_lib_path):
@@ -529,7 +536,7 @@ class MachCommands(CommandBase):
             env.setdefault("CMAKE_TOOLCHAIN_FILE", path.join(ml_support, "toolchain.cmake"))
 
             # The Open SSL configuration
-            env.setdefault("OPENSSL_DIR", path.join(self.get_target_dir(), target, "magicleap", "openssl"))
+            env.setdefault("OPENSSL_DIR", path.join(target_path, target, "native", "openssl"))
             env.setdefault("OPENSSL_VERSION", "1.0.2k")
             env.setdefault("OPENSSL_STATIC", "1")
 
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:
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 019ec103598..aa8a80af7a2 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -44,8 +44,8 @@ from servo.util import delete
 
 PACKAGES = {
     'android': [
-        'target/armv7-linux-androideabi/release/servoapp.apk',
-        'target/armv7-linux-androideabi/release/servoview.aar',
+        'target/android/armv7-linux-androideabi/release/servoapp.apk',
+        'target/android/armv7-linux-androideabi/release/servoview.aar',
     ],
     'linux': [
         'target/release/servo-tech-demo.tar.gz',
@@ -57,11 +57,11 @@ PACKAGES = {
         'target/release/brew/servo.tar.gz',
     ],
     'magicleap': [
-        'target/aarch64-linux-android/release/Servo2D.mpk',
+        'target/magicleap/aarch64-linux-android/release/Servo2D.mpk',
     ],
     'maven': [
-        'target/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/',
-        'target/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/',
+        'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/',
+        'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-x86/',
     ],
     'windows-msvc': [
         r'target\release\msi\Servo.exe',
@@ -578,7 +578,7 @@ class PackageCommands(CommandBase):
             BUCKET = 'servo-builds'
 
             nightly_dir = 'nightly/maven'
-            dest_key_base = directory.replace("target/gradle/servoview/maven", nightly_dir)
+            dest_key_base = directory.replace("target/android/gradle/servoview/maven", nightly_dir)
             if dest_key_base[-1] == '/':
                 dest_key_base = dest_key_base[:-1]