Move Android and ML build artefacts to their own subdirectory

Works around #20380.
This commit is contained in:
Anthony Ramine 2018-11-27 13:26:38 +01:00
parent 524bd722ef
commit 496a62860e
10 changed files with 51 additions and 47 deletions

View file

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