diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 15:41:56 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 15:41:56 +0000 |
| commit | 117cae2668f9004d64df74a642591d41f6bfef2b (patch) | |
| tree | 8bac2070ce22ef875628773d717fd858caf4aa58 /build/android/pylib/test_package.py | |
| parent | 3ac8b1c27bd58b0476648678f076150ff60a8713 (diff) | |
| download | chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.zip chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.tar.gz chromium_src-117cae2668f9004d64df74a642591d41f6bfef2b.tar.bz2 | |
Android: upstream latest changes for build/android.
- uses $EXTERNAL_STORAGE rather than /sdcard
- split PerfTEstSetup from android_commands.py
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10914199
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/test_package.py')
| -rw-r--r-- | build/android/pylib/test_package.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/android/pylib/test_package.py b/build/android/pylib/test_package.py index 8f28e02..f7e321d 100644 --- a/build/android/pylib/test_package.py +++ b/build/android/pylib/test_package.py @@ -110,27 +110,28 @@ class TestPackage(object): return ret def PushDataAndPakFiles(self): + external_storage = self.adb.GetExternalStorage() if (self.test_suite_basename == 'ui_unittests' or self.test_suite_basename == 'unit_tests'): self.adb.PushIfNeeded( self.test_suite_dirname + '/chrome.pak', - constants.TEST_DATA_DIR + '/paks/chrome.pak') + external_storage + '/paks/chrome.pak') self.adb.PushIfNeeded( self.test_suite_dirname + '/locales/en-US.pak', - constants.TEST_DATA_DIR + '/paks/en-US.pak') + external_storage + '/paks/en-US.pak') if self.test_suite_basename == 'unit_tests': self.adb.PushIfNeeded( self.test_suite_dirname + '/resources.pak', - constants.TEST_DATA_DIR + '/paks/resources.pak') + external_storage + '/paks/resources.pak') self.adb.PushIfNeeded( self.test_suite_dirname + '/chrome_100_percent.pak', - constants.TEST_DATA_DIR + '/paks/chrome_100_percent.pak') + external_storage + '/paks/chrome_100_percent.pak') self.adb.PushIfNeeded(self.test_suite_dirname + '/test_data', - constants.TEST_DATA_DIR + '/test_data') + external_storage + '/test_data') if self.test_suite_basename == 'content_unittests': self.adb.PushIfNeeded( self.test_suite_dirname + '/content_resources.pak', - constants.TEST_DATA_DIR + '/paks/content_resources.pak') + external_storage + '/paks/content_resources.pak') def _WatchTestOutput(self, p): """Watches the test output. |