From 0b245ac2c84fe814781677e6324e148d05850dee Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Thu, 6 Jul 2017 13:34:25 +0100
Subject: [PATCH] Workload: Move package initialization into setup

To support runs that require different versions of an application
the discovery/installation process should be performed at the beginning
of each iteration and therefore has been moved into setup.
---
 wa/framework/workload.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wa/framework/workload.py b/wa/framework/workload.py
index e20a0c26..29635e5e 100644
--- a/wa/framework/workload.py
+++ b/wa/framework/workload.py
@@ -437,9 +437,9 @@ class PackageHandler(object):
 
     def initialize(self, context):
         self.resolve_package(context)
-        self.initialize_package(context)
 
     def setup(self, context):
+        self.initialize_package(context)
         self.start_activity()
         self.target.execute('am kill-all')  # kill all *background* activities
         self.target.clear_logcat()