Make different launchers handle args the same way, fix missing docstrings
Signed-off-by: sweeneys <sweeneys@amazon.com>
This commit is contained in:
@@ -163,9 +163,23 @@ class AndroidLauncher(Launcher):
|
||||
|
||||
return True
|
||||
|
||||
def setup(self):
|
||||
def setup(self, backupFiles=True, launch_ap=True, configure_settings=True):
|
||||
"""
|
||||
Perform setup of this launcher, must be called before launching.
|
||||
Subclasses should call its parent's setup() before calling its own code, unless it changes configuration files
|
||||
|
||||
:param backupFiles: Bool to backup setup files
|
||||
:param launch_ap: Bool to launch the asset processor
|
||||
:param configure_settings: Bool to update settings caches
|
||||
:return: None
|
||||
"""
|
||||
# Backup
|
||||
self.backup_settings()
|
||||
if backupFiles:
|
||||
self.backup_settings()
|
||||
|
||||
# Base setup defaults to None
|
||||
if launch_ap is None:
|
||||
launch_ap = True
|
||||
|
||||
# Enable Android capabilities and verify environment is setup before continuing.
|
||||
self._is_valid_android_environment()
|
||||
@@ -174,7 +188,7 @@ class AndroidLauncher(Launcher):
|
||||
# Modify and re-configure
|
||||
self.configure_settings()
|
||||
self.workspace.shader_compiler.start()
|
||||
super(AndroidLauncher, self).setup()
|
||||
super(AndroidLauncher, self).setup(backupFiles, launch_ap, configure_settings)
|
||||
|
||||
def teardown(self):
|
||||
ly_test_tools.mobile.android.undo_tcp_port_changes(self._device_id)
|
||||
|
||||
Reference in New Issue
Block a user