Revert "WebLayer: Don't use --replace-system-package to install WebLayer shell"
This reverts commit f4faad82c22e4661fb64c42f62f30b2589b59062.
Reason for revert: CL is causing failures in Android Marshmallow x86 skew tests, https://ci.chromium.org/p/chromium/builders/ci/android-weblayer-marshmallow-x86-rel-tests/12716
Original change's description:
> WebLayer: Don't use --replace-system-package to install WebLayer shell
>
> WebLayer shell is not a system package on Android devices. It should
> be installed as a user apk. This CL also updates gn args for the Android
> Pie x86 WebLayer try builder.
>
> Bug: None
> Change-Id: I763fa98143e9e3621360dd4b0f773e4ecbf04d40
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3268463
> Reviewed-by: Haiyang Pan <[email protected]>
> Commit-Queue: Rakib Hasan <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#939559}
Bug: None
Change-Id: I5dfb063bde256290d82844c427d398de2d71dc9a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3267941
Auto-Submit: Rakib Hasan <[email protected]>
Bot-Commit: Rubber Stamper <[email protected]>
Commit-Queue: Haiyang Pan <[email protected]>
Reviewed-by: Haiyang Pan <[email protected]>
Cr-Commit-Position: refs/heads/main@{#939863}
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index ba23aa3..1708394 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -3398,6 +3398,20 @@
},
},
},
+ 'weblayer_instrumentation_test_apk_ToT_Tests': {
+ 'modifications': {
+ 'android-weblayer-10-x86-rel-tests': {
+ 'args': [
+ '--replace-system-package=org.chromium.weblayer.shell,apks/WebLayerShellSystemWebView.apk'
+ ]
+ },
+ 'android-weblayer-marshmallow-x86-rel-tests': {
+ 'args': [
+ '--replace-system-package=org.chromium.weblayer.shell,apks/WebLayerShellSystemWebView.apk'
+ ]
+ }
+ }
+ },
'weblayer_private_instrumentation_test_apk': {
'modifications': {
# TODO(crbug.com/1189403): Remove the filter once the issue is fixed.
