Implement DeleteFile for android

2 files changed, 17 insertions, 9 deletions

diff --git a/ACE/bin/PerlACE/ProcessAndroid.pm b/ACE/bin/PerlACE/ProcessAndroid.pm
index e663acf8378..0aace2ff45c 100644
--- a/ACE/bin/PerlACE/ProcessAndroid.pm
+++ b/ACE/bin/PerlACE/ProcessAndroid.pm
@@ -258,17 +258,11 @@ sub remove_executable ()
   my $adb_process = $ENV{'ANDROID_SDK_ROOT'} . "/platform-tools/adb";
 
   my $cmd = $adb_process . ' shell rm ' . $fsroot_target. $test;
-  my $rm_log = $adb_process . ' shell rm ' . $fsroot_target. '/log/' . $test . '.log';
 
   if (defined $ENV{'ACE_TEST_VERBOSE'}) {
       print STDERR "Start to execute : $cmd\n";
   }
   system ( $cmd );
-
-  if (defined $ENV{'ACE_TEST_VERBOSE'}) {
-      print STDERR "Start to execute : $rm_log\n";
-  }
-  system ( $rm_log );
 }
 
 sub Spawn ()
diff --git a/ACE/bin/PerlACE/TestTarget_Android.pm b/ACE/bin/PerlACE/TestTarget_Android.pm
index a3b68b30804..ba1cd071254 100644
--- a/ACE/bin/PerlACE/TestTarget_Android.pm
+++ b/ACE/bin/PerlACE/TestTarget_Android.pm
@@ -281,11 +281,25 @@ sub DeleteFile ($)
 {
     my $self = shift;
     my $file = shift;
-    my $newfile = $self->LocalFile($file);
+    my $silent;
+
+    if (!defined $ENV{'ACE_TEST_VERBOSE'}) {
+      $silent = "2> /dev/null"
+    }
+
+    my $adb_process = $ENV{'ANDROID_SDK_ROOT'} . "/platform-tools/adb";
+
+    my $cmd = "$adb_process" . ' shell rm '. "$file $silent";
+
     if (defined $ENV{'ACE_TEST_VERBOSE'}) {
-        print STDERR "delete $newfile\n";
+      print STDERR "DeleteFile cmd: $cmd\n";
     }
-    unlink ("$newfile");
+
+    system ( $cmd );
+    if ($? != 0) {
+        return -1;
+    }
+    return 0;
 }
 
 sub Kill ()