Merge "Add back tethering to TEST_MAPPING" into stage-aosp-master

This commit is contained in:
TreeHugger Robot
2021-09-10 07:35:27 +00:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 3 deletions

View File

@@ -29,8 +29,7 @@
], ],
"mainline-presubmit": [ "mainline-presubmit": [
{ {
// TODO: add back the tethering modules when updatable in this branch "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]",
"options": [ "options": [
{ {
"exclude-annotation": "com.android.testutils.SkipPresubmit" "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="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+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" /> <option name="not-shardable" value="true" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" /> <option name="cleanup-apks" value="true" />