Backed out changeset 45d01b30e9d1 (bug 1340564)

--HG--
extra : rebase_source : e3238eec4fa8f1023fa7ad8c867a66bdfc817630

taskcluster/taskgraph/loader/push_apk.py

@@ -26,8 +26,7 @@ def get_dependent_loaded_tasks(config, loaded_tasks):
         task for task in nightly_tasks if task.kind in config.get('kind-dependencies')
     )
     android_tasks = [
-        task for task in tasks_with_matching_kind
-        if task.attributes.get('build_platform', '').startswith('android')
+        task for task in tasks_with_matching_kind if 'android' in task.label
     ]
 
     return android_tasks

taskcluster/taskgraph/util/push_apk.py

@@ -9,10 +9,7 @@ import re
 
 from taskgraph.util.schema import validate_schema
 
-REQUIRED_ARCHITECTURES = {
-    'android-x86-nightly',
-    'android-api-15-nightly',
-}
+REQUIRED_ARCHITECTURES = ('android-x86', 'android-api-15')
 PLATFORM_REGEX = re.compile(r'signing-android-(\S+)-nightly')
 
 
@@ -39,9 +36,15 @@ def validate_dependent_tasks_transform(_, jobs):
 
 
 def check_every_architecture_is_present_in_dependent_tasks(dependent_tasks):
-    dep_platforms = set(t.attributes.get('build_platform') for t in dependent_tasks)
-    missed_architectures = REQUIRED_ARCHITECTURES - dep_platforms
-    if missed_architectures:
+    dependencies_labels = [task.label for task in dependent_tasks]
+
+    is_this_required_architecture_present = {
+        architecture: any(architecture in label for label in dependencies_labels)
+        for architecture in REQUIRED_ARCHITECTURES
+    }
+    are_all_required_achitectures_present = all(is_this_required_architecture_present.values())
+
+    if not are_all_required_achitectures_present:
         raise Exception('''One or many required architectures are missing.
 
 Required architectures: {}.