Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master am: 74f74987bc am: 22e2abfd16

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15743502

Change-Id: If50e01ca1b92fb16d83529729a2bb670bb409ea7
This commit is contained in:
TreeHugger Robot
2021-09-10 08:08:52 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 3 deletions

View File

@@ -29,8 +29,7 @@
],
"mainline-presubmit": [
{
// TODO: add back the tethering modules when updatable in this branch
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]",
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [
{
"exclude-annotation": "com.android.testutils.SkipPresubmit"

View File

@@ -21,7 +21,6 @@
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex" />
<option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />