Merge "Add CtsTetheringTestLatestSdk into mainline-presubmit" am: 72fe588d45
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2164002 Change-Id: I3914f8eca802c3bdc5f6b3b3809066263ae21973 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -224,6 +224,9 @@
|
||||
"exclude-annotation": "androidx.test.filters.LargeTest"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
|
||||
}
|
||||
],
|
||||
"mainline-postsubmit": [
|
||||
@@ -231,6 +234,10 @@
|
||||
{
|
||||
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
||||
"keywords": ["sim"]
|
||||
},
|
||||
{
|
||||
"name": "CtsTetheringTestLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
|
||||
"keywords": ["sim"]
|
||||
}
|
||||
],
|
||||
"imports": [
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
|
||||
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
|
||||
<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="not-shardable" value="true" />
|
||||
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
|
||||
<option name="cleanup-apks" value="true" />
|
||||
|
||||
Reference in New Issue
Block a user