Bug 1206379 - Fix blobfree distribution collect for nexus-5-l. r=wcosta

This commit is contained in:
Alexandre Lissy 2015-09-22 04:13:00 +02:00
parent f0c09cf0ed
commit 5715f71943
2 changed files with 5 additions and 10 deletions

View File

@ -740,14 +740,9 @@ class B2GBuild(LocalesMixin, PurgeMixin,
if base_pattern in public_upload_patterns:
public_files.append(f)
device_name = self.config['target'].split('-')[0]
blobfree_zip = os.path.join(
dirs['work_dir'],
'out',
'target',
'product',
device_name,
device_name + '.blobfree-dist.zip')
device_name = os.path.basename(output_dir)
blobfree_dist = device_name + '.blobfree-dist.zip'
blobfree_zip = os.path.join(output_dir, blobfree_dist)
if os.path.exists(blobfree_zip):
public_files.append(blobfree_zip)

View File

@ -21,8 +21,8 @@ if [ -f $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip ]; then
mv $WORKSPACE/B2G/upload/b2g-*.crashreporter-symbols.zip $HOME/artifacts/b2g-crashreporter-symbols.zip
fi
if [ -f $WORKSPACE/B2G/upload-public/${DEVICE}.blobfree-dist.zip ]; then
mv $WORKSPACE/B2G/upload-public/${DEVICE}.blobfree-dist.zip $HOME/artifacts-public
if [ -f $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip ]; then
mv $WORKSPACE/B2G/upload-public/*.blobfree-dist.zip $HOME/artifacts-public/
fi
if [ -f $WORKSPACE/B2G/upload-public/$mar_file ]; then