diff options
| author | David Su <dysu@google.com> | 2020-05-12 19:24:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-12 19:24:49 +0000 |
| commit | 1f6460fd04da318dc22d6889e0558e45e6ea4bbe (patch) | |
| tree | 2f87bc903d529b9eb7f364ac8183c0928b3ff0e1 | |
| parent | 8bf29f623fffb96162c559a56d55d756d2a251d7 (diff) | |
| parent | b067f306691fc705114fca7f145dea676bb0e677 (diff) | |
Merge "Revert "opt/net/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev am: b067f30669
Change-Id: I5107ec90e2f75e55b6f494cdb13379eba3dd3e82
| -rw-r--r-- | tests/mts/AndroidTest.xml | 4 | ||||
| -rw-r--r-- | tests/wifitests/AndroidTest.xml | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/mts/AndroidTest.xml b/tests/mts/AndroidTest.xml index 1e9266c09..ee5878600 100644 --- a/tests/mts/AndroidTest.xml +++ b/tests/mts/AndroidTest.xml @@ -36,9 +36,5 @@ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> <option name="mainline-module-package-name" value="com.google.android.wifi" /> - <!-- TODO(b/151836001): com.android.wifi doesn't guarantee it is a Mainline module since - it could still be OEM customized. Workaround so that this test will still run on - AOSP builds. --> - <option name="mainline-module-package-name" value="com.android.wifi" /> </object> </configuration> diff --git a/tests/wifitests/AndroidTest.xml b/tests/wifitests/AndroidTest.xml index d55123ddc..f904a4436 100644 --- a/tests/wifitests/AndroidTest.xml +++ b/tests/wifitests/AndroidTest.xml @@ -30,9 +30,5 @@ <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> <option name="mainline-module-package-name" value="com.google.android.wifi" /> - <!-- TODO(b/151836001): com.android.wifi doesn't guarantee it is a Mainline module since - it could still be OEM customized. Workaround so that this test will still run on - AOSP builds. --> - <option name="mainline-module-package-name" value="com.android.wifi" /> </object> </configuration> |