Fix test data push for APK tests.

build/android/test_package_apk.py

 # Copyright (c) 2012 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.
 
 
 import os
 import sys
 
 import cmd_helper
 import logging
@@ skipping 71 matching lines @@
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
     logging.info('Uninstalling any activity with the test name')
     self.adb.Adb().SendCommand('uninstall org.chromium.native_test',
                                timeout_time=60*5)
     logging.info('Installing new apk')
     self.adb.Adb().SendCommand('install -r ' + self.test_suite_full,
                                timeout_time=60*5)
     logging.info('Install has completed.')
 
-  def GetDisabledTestsBaseFileName(self):
-    """Returns the  base filename of gtest filter."""
+  def _GetTestSuiteBaseName(self):
+    """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
-    return self.test_suite_basename.rsplit('-debug', 1)[0]
+    return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]