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

Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 am: 6709c9b056

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: Idf16454383a65e6ccc1c4672c7d83e8742512ea7
This commit is contained in:
Treehugger Robot
2021-06-28 06:57:47 +00:00
committed by Automerger Merge Worker
parent 0304c86c09 6709c9b056
commit 2b373de5a4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/Android.bp
View File

@@ -50,9 +50,6 @@ android_test {
// TODO: change to 31 as soon as it is available // TODO: change to 31 as soon as it is available
target_sdk_version: "30", target_sdk_version: "30",
test_suites: ["device-tests", "mts"], test_suites: ["device-tests", "mts"],
test_mainline_modules: [
"CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex",
],
defaults: [ defaults: [
"framework-connectivity-test-defaults", "framework-connectivity-test-defaults",
"FrameworksNetTests-jni-defaults", "FrameworksNetTests-jni-defaults",

1
tests/common/AndroidTest_Coverage.xml
View File

@@ -18,6 +18,7 @@
</target_preparer> </target_preparer>
<option name="test-tag" value="ConnectivityCoverageTests" /> <option name="test-tag" value="ConnectivityCoverageTests" />
<option name="config-descriptor:metadata" key="mainline-param" value="CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" > <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="com.android.connectivity.tests.coverage" /> <option name="package" value="com.android.connectivity.tests.coverage" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />