summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-05-09 00:21:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-09 00:21:18 +0000
commitb067f306691fc705114fca7f145dea676bb0e677 (patch)
treeb1a7a14a30b5aaca45d8582388f7a9a9b571f58c
parent2c347cf23a20e8b408a4342eff4972851bd8bcff (diff)
parented6fae1d60892efb0c01ab1dedf7c280124bd761 (diff)
Merge "Revert "opt/net/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev
-rw-r--r--tests/mts/AndroidTest.xml4
-rw-r--r--tests/wifitests/AndroidTest.xml4
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>