diff options
| author | David Su <dysu@google.com> | 2020-05-12 19:29:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-12 19:29:53 +0000 |
| commit | f68a31d3bde3fd70efda93c07efaeef0587a2ae5 (patch) | |
| tree | 2f909917487fc273b4b7d41841160b769072cf63 | |
| parent | f542c0b8c2b1e5aa02e1e0ddfd930b3b2617e966 (diff) | |
| parent | 1f6460fd04da318dc22d6889e0558e45e6ea4bbe (diff) | |
Merge "Revert "opt/net/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev am: b067f30669 am: 1f6460fd04
Change-Id: I710bd9df507f90f0d427348b3f65923fa731115b
| -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> |