summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstip <stip@chromium.org>2015-11-13 02:32:54 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-13 10:33:50 +0000
commitdee5163a66d0842b1aea4da2d97c66b7afd4e73c (patch)
treec4b748adb9ed6f3f1bc1291973c189f9580aadcb
parentef5d5ac94ec7a6e8e6b687da4ae4dfc408107697 (diff)
downloadchromium_src-dee5163a66d0842b1aea4da2d97c66b7afd4e73c.zip
chromium_src-dee5163a66d0842b1aea4da2d97c66b7afd4e73c.tar.gz
chromium_src-dee5163a66d0842b1aea4da2d97c66b7afd4e73c.tar.bz2
Revert of Disable platform-mode to try and green up tests. (patchset #1 id:1 of https://codereview.chromium.org/1445503002/ )
Reason for revert: didn't seem to help https://build.chromium.org/p/chromium.swarm/builders/Android%20Swarm/builds/3775 Original issue's description: > Disable platform-mode to try and green up tests. > > BUG=525873 > R=jbudorick@chromium.org > TBR=jbudorick@chromium.org > NOTRY=True > CC=maruel@chromium.org > > Committed: https://crrev.com/49b3d93eac886e0fe953b2a3db12c96d99e6ee9e > Cr-Commit-Position: refs/heads/master@{#359522} TBR=jbudorick@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=525873 Review URL: https://codereview.chromium.org/1445523002 Cr-Commit-Position: refs/heads/master@{#359530}
-rw-r--r--chrome/android/chrome_public_test_apk.isolate1
-rw-r--r--chrome/android/chrome_sync_shell_test_apk.isolate1
-rw-r--r--content/content_shell_test_apk_run.isolate1
3 files changed, 3 insertions, 0 deletions
diff --git a/chrome/android/chrome_public_test_apk.isolate b/chrome/android/chrome_public_test_apk.isolate
index baece5c..877e68d 100644
--- a/chrome/android/chrome_public_test_apk.isolate
+++ b/chrome/android/chrome_public_test_apk.isolate
@@ -9,6 +9,7 @@
'variables': {
'command': [
'<(PRODUCT_DIR)/bin/run_chrome_public_test_apk',
+ '--enable-platform-mode',
'-e', 'local', '--apk-under-test',
'<(PRODUCT_DIR)/apks/ChromePublic.apk',
],
diff --git a/chrome/android/chrome_sync_shell_test_apk.isolate b/chrome/android/chrome_sync_shell_test_apk.isolate
index 489eb37..ea45408 100644
--- a/chrome/android/chrome_sync_shell_test_apk.isolate
+++ b/chrome/android/chrome_sync_shell_test_apk.isolate
@@ -8,6 +8,7 @@
'variables': {
'command': [
'<(PRODUCT_DIR)/bin/run_chrome_sync_shell_test_apk',
+ '--enable-platform-mode',
'-e', 'local', '--apk-under-test',
'<(PRODUCT_DIR)/apks/ChromeSyncShell.apk',
],
diff --git a/content/content_shell_test_apk_run.isolate b/content/content_shell_test_apk_run.isolate
index 9d0c64f..8062494 100644
--- a/content/content_shell_test_apk_run.isolate
+++ b/content/content_shell_test_apk_run.isolate
@@ -9,6 +9,7 @@
'variables': {
'command': [
'<(PRODUCT_DIR)/bin/run_content_shell_test_apk',
+ '--enable-platform-mode',
'-e', 'local', '--apk-under-test',
'<(PRODUCT_DIR)/apks/ContentShell.apk',
],