Update Gradle and SDK

python/servo/bootstrap_commands.py

@@ -63,7 +63,7 @@ class MachCommands(CommandBase):
         ndk = "android-ndk-r12b-{system}-{arch}"
         tools = "sdk-tools-{system}-4333796"
 
-        sdk_build_tools = "25.0.2"
+        sdk_build_tools = "27.0.3"
         emulator_images = [
             ("servo-arm", "25", "google_apis;armeabi-v7a"),
             ("servo-x86", "28", "google_apis;x86"),

python/servo/command_base.py

@@ -333,7 +333,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"])
-        apk_name = "servo.apk"
+        apk_name = "servoapp.apk"
         build_type = "release" if release else "debug"
         return path.join(base_path, build_type, apk_name)
 

python/servo/package_commands.py

@@ -42,7 +42,7 @@ from servo.util import delete
 
 PACKAGES = {
     'android': [
-        'target/armv7-linux-androideabi/release/servo.apk',
+        'target/armv7-linux-androideabi/release/servoapp.apk',
     ],
     'linux': [
         'target/release/servo-tech-demo.tar.gz',

python/servo/testing_commands.py

@@ -607,8 +607,7 @@ class MachCommands(CommandBase):
         env = self.build_env(target=target)
         os.environ["PATH"] = env["PATH"]
         assert self.handle_android_target(target)
-        binary_path = self.get_binary_path(release, dev, android=True)
-        apk = binary_path + ".apk"
+        apk = self.get_apk_path(release)
 
         py = path.join(self.context.topdir, "etc", "run_in_headless_android_emulator.py")
         return [py, avd, apk]