LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add com.google.android.resolv.apex and com.google.android.tethering.apex for CtsNetTestCasesLatestSdk." am: 7851370b12 am: c408ae280f am: 7d70389950

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1471584

Change-Id: Ifb79bfaad1875d924b26332a0f72fc6cf9dcf93c
This commit is contained in:
Treehugger Robot
2020-10-26 10:12:14 +00:00
committed by Automerger Merge Worker
parent 37a09d2a17 7d70389950
commit a888654d70
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/AndroidTestTemplate.xml
View File

@@ -20,7 +20,7 @@
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" /> <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="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk" /> <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" /> <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" />

2
tests/cts/net/TEST_MAPPING
View File

@@ -12,7 +12,7 @@
], ],
"mainline-presubmit": [ "mainline-presubmit": [
{ {
"name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk]", "name": "CtsNetTestCasesLatestSdk[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [ "options": [
{ {
"exclude-annotation": "com.android.testutils.SkipPresubmit" "exclude-annotation": "com.android.testutils.SkipPresubmit"