diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2018-11-27 13:26:38 +0100 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2018-11-28 13:00:44 +0100 |
| commit | 496a62860e04578ca2616940c28f036842e37bcb (patch) | |
| tree | 14ad522acb192474fc5b00ff86ca2d2efae16115 /python/servo/package_commands.py | |
| parent | 524bd722ef84d0b1dff60a68102402d06affe9ab (diff) | |
| download | servo-496a62860e04578ca2616940c28f036842e37bcb.tar.gz servo-496a62860e04578ca2616940c28f036842e37bcb.zip | |
Move Android and ML build artefacts to their own subdirectory
Works around #20380.
Diffstat (limited to 'python/servo/package_commands.py')
| -rw-r--r-- | python/servo/package_commands.py | 12 |
1 files changed, 6 insertions, 6 deletions
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] |