Revert of upload SKP renderings that did not match expectations

slave/skia_slave_scripts/flavor_utils/android_build_step_utils.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ Utilities for Android build steps. """
 
 from default_build_step_utils import DefaultBuildStepUtils, DeviceDirs
 from utils import android_utils
 from utils import gs_utils
 from utils import shell_utils
@@ skipping 101 matching lines @@
         # it to come back up.
         shell_utils.run([android_utils.PATH_TO_ADB, '-s', self._serial,
                          'reboot'])
         time.sleep(60)
       android_utils.StopShell(self._serial)
     else:
       android_utils.ADBKill(self._serial, 'com.skia', kill_app=True)
 
   def RunGYP(self):
     print 'android_ninja handles gyp'
+    pass
 
   def Compile(self, target):
     """ Compile the Skia executables. """
     os.environ['SKIA_ANDROID_VERBOSE_SETUP'] = '1'
     os.environ['PATH'] = os.path.abspath(
         os.path.join(os.pardir, os.pardir, os.pardir, os.pardir, 'third_party',
                      'gsutil')) + os.pathsep + os.environ['PATH']
     os.environ['BOTO_CONFIG'] = os.path.abspath(os.path.join(
         os.pardir, os.pardir, os.pardir, os.pardir, 'site_config', '.boto'))
     os.environ['ANDROID_SDK_ROOT'] = self._step.args['android_sdk_root']
@@ skipping 24 matching lines @@
     os.environ['ANDROID_SDK_ROOT'] = self._step.args['android_sdk_root']
 
   def GetDeviceDirs(self):
     """ Set the directories which will be used by the BuildStep. """
     if self._serial:
       device_scratch_dir = shell_utils.run(
           '%s -s %s shell echo \$EXTERNAL_STORAGE' % (
               android_utils.PATH_TO_ADB, self._serial),
           echo=True, shell=True).rstrip().split('\n')[-1]
       prefix = posixpath.join(device_scratch_dir, 'skiabot', 'skia_')
-      return DeviceDirs(
-          perf_data_dir=prefix + 'perf',
-          gm_actual_dir=prefix + 'gm_actual',
-          gm_expected_dir=prefix + 'gm_expected',
-          resource_dir=prefix + 'resources',
-          skimage_in_dir=prefix + 'skimage_in',
-          skimage_expected_dir=prefix + 'skimage_expected',
-          skimage_out_dir=prefix + 'skimage_out',
-          skp_dir=prefix + 'skp',
-          skp_perf_dir=prefix + 'skp_perf',
-          playback_actual_images_dir=prefix + 'playback_actual_images',
-          playback_actual_summaries_dir=prefix + 'playback_actual_summaries',
-          playback_expected_summaries_dir=(
-              prefix + 'playback_expected_summaries'),
-          tmp_dir=prefix + 'tmp_dir')
+      return DeviceDirs(perf_data_dir=prefix + 'perf',
+                        gm_actual_dir=prefix + 'gm_actual',
+                        gm_expected_dir=prefix + 'gm_expected',
+                        resource_dir=prefix + 'resources',
+                        skimage_in_dir=prefix + 'skimage_in',
+                        skimage_expected_dir=prefix + 'skimage_expected',
+                        skimage_out_dir=prefix + 'skimage_out',
+                        skp_dir=prefix + 'skp',
+                        skp_perf_dir=prefix + 'skp_perf',
+                        skp_out_dir=prefix + 'skp_out',
+                        tmp_dir=prefix + 'tmp_dir')