Bug 1175934 part 1: Copy blobfree zip to public upload dir.

If we ./build.sh blobfree, move the zip file to public upload
dir.

Also, we don't need a blobfree specific config file anymore.
This commit is contained in:
Wander Lairson Costa 2015-07-31 17:24:46 -03:00
parent bf199010b5
commit 70872936d6
2 changed files with 12 additions and 31 deletions

View File

@ -1,31 +0,0 @@
#!/usr/bin/env python
config = {
"default_vcs": "tc-vcs",
"default_actions": [
'checkout-sources',
'build',
'build-symbols',
'prep-upload'
],
"upload": {
"default": {
"upload_dep_target_exclusions": []
}
},
"env": {
"GAIA_OPTIMIZE": "1",
"WGET_OPTS": "-c -q"
},
"build_targets": ["blobfree"],
"is_automation": True,
"repo_remote_mappings": {
'https://android.googlesource.com/': 'https://git.mozilla.org/external/aosp',
'git://codeaurora.org/': 'https://git.mozilla.org/external/caf',
'https://git.mozilla.org/b2g': 'https://git.mozilla.org/b2g',
'git://github.com/mozilla-b2g/': 'https://git.mozilla.org/b2g',
'git://github.com/mozilla/': 'https://git.mozilla.org/b2g',
'https://git.mozilla.org/releases': 'https://git.mozilla.org/releases',
'http://android.git.linaro.org/git-ro/': 'https://git.mozilla.org/external/linaro',
'git://github.com/apitrace/': 'https://git.mozilla.org/external/apitrace',
},
}

View File

@ -711,6 +711,18 @@ 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')
if os.path.exists(blobfree_zip):
public_files.append(blobfree_zip)
for base_f in files + public_files:
f = base_f
if f.endswith(".img"):