Remove base-* directories from gm expected/actual paths; just use platform names

buildbot/slave/skia_slave_scripts/build_step.py

Index: buildbot/slave/skia_slave_scripts/build_step.py
===================================================================
--- buildbot/slave/skia_slave_scripts/build_step.py	(revision 10693)
+++ buildbot/slave/skia_slave_scripts/build_step.py	(working copy)
@@ -153,7 +153,6 @@
       raise Exception('Unrecognized build flavor: %s\n%s' % (flavor, e))
 
     self._configuration = args['configuration']
-    self._gm_image_subdir = args['gm_image_subdir']
 
     self._target_platform = args['target_platform']
     self._deps_target_os = \
@@ -169,9 +168,9 @@
     self._gm_actual_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'actual')
     self._gm_merge_basedir = os.path.join(os.pardir, os.pardir, 'gm', 'merge')
     self._gm_expected_dir = os.path.join('expectations', 'gm',
-                                         self._gm_image_subdir)
+                                         self._builder_name)
     self._gm_actual_dir = os.path.join(self._gm_actual_basedir,
-                                       self._gm_image_subdir)
+                                       self._builder_name)
     self._gm_actual_svn_baseurl = '%s/%s' % (args['autogen_svn_baseurl'],
                                              'gm-actual')
     self._resource_dir = 'resources'
@@ -193,11 +192,11 @@
 
     # Adding the playback directory transfer objects.
     self._local_playback_dirs = LocalSkpPlaybackDirs(
-        self._builder_name, self._gm_image_subdir,
+        self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])
     self._storage_playback_dirs = StorageSkpPlaybackDirs(
-        self._builder_name, self._gm_image_subdir,
+        self._builder_name,
         None if args['perf_output_basedir'] == 'None'
             else args['perf_output_basedir'])