diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-02-06 16:43:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-07 00:43:51 +0000 |
| commit | 4cf59ffaa830d5edad26a439ba13f07ce0447394 (patch) | |
| tree | ea49faf6e345e3b3167e2f4a720eddbbcab68772 /build/android | |
| parent | c491dbfaad049247a5d2f92ab5ad823725414e70 (diff) | |
| download | chromium_src-4cf59ffaa830d5edad26a439ba13f07ce0447394.zip chromium_src-4cf59ffaa830d5edad26a439ba13f07ce0447394.tar.gz chromium_src-4cf59ffaa830d5edad26a439ba13f07ce0447394.tar.bz2 | |
[Android] Convert ContentShellTest.apk to isolate.
We were previously using --test-data to push files from
//content/test/data/android/device_files to
$EXTERNAL_STORAGE/chrome/test/data/content. Switching to isolate lets
us handle all of our instrumentation and gtest data dependencies in the
same way. It will also facilitate using isolate to optimize transfers
between builders and testers.
BUG=400499
TBR=maruel@chromium.org
Review URL: https://codereview.chromium.org/878163004
Cr-Commit-Position: refs/heads/master@{#315148}
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/instrumentation/setup.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/android/pylib/instrumentation/setup.py b/build/android/pylib/instrumentation/setup.py index 8dacc3d..bdde80d 100644 --- a/build/android/pylib/instrumentation/setup.py +++ b/build/android/pylib/instrumentation/setup.py @@ -89,15 +89,15 @@ def Setup(test_options, devices): if test_options.test_data: device_utils.DeviceUtils.parallel(devices).pMap( _PushDataDeps, test_options) - else: + + if test_options.isolate_file_path: base_setup.GenerateDepsDirUsingIsolate(test_options.test_apk, test_options.isolate_file_path, ISOLATE_FILE_PATHS, DEPS_EXCLUSION_LIST) def push_data_deps_to_device_dir(device): - device_dir = os.path.join(device.GetExternalStoragePath(), - DEVICE_DATA_DIR) - base_setup.PushDataDeps(device, device_dir, test_options) + base_setup.PushDataDeps(device, device.GetExternalStoragePath(), + test_options) device_utils.DeviceUtils.parallel(devices).pMap( push_data_deps_to_device_dir) |