remove stale test data on the device

build/android/pylib/base/base_setup.py

Index: build/android/pylib/base/base_setup.py
diff --git a/build/android/pylib/base/base_setup.py b/build/android/pylib/base/base_setup.py
index c2768228413643fda7e7c1723b6976a50a46869a..800d38cf391053979d019774bc53974b66a27994 100644
--- a/build/android/pylib/base/base_setup.py
+++ b/build/android/pylib/base/base_setup.py
@@ -56,7 +56,13 @@ def GenerateDepsDirUsingIsolate(suite_name, isolate_file_path,
 def PushDataDeps(device, device_dir, test_options):
   valgrind_tools.PushFilesForTool(test_options.tool, device)
   if os.path.exists(constants.ISOLATE_DEPS_DIR):
-    device.PushChangedFiles([
-        (os.path.join(constants.ISOLATE_DEPS_DIR, p),
-         '%s/%s' % (device_dir, p))
-        for p in os.listdir(constants.ISOLATE_DEPS_DIR)])
+    if test_options.delete_stale_data:
+      device.PushAndDeleteFiles(device_dir, [
+          (os.path.join(constants.ISOLATE_DEPS_DIR, p),
+           '%s/%s' % (device_dir, p))
+          for p in os.listdir(constants.ISOLATE_DEPS_DIR)])
+    else:
+      device.PushChangedFiles([
+          (os.path.join(constants.ISOLATE_DEPS_DIR, p),
+           '%s/%s' % (device_dir, p))
+          for p in os.listdir(constants.ISOLATE_DEPS_DIR)])