Merge "Revert "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev am: 5d1cb4fe1e am: 0c9c65dfe1 am: e9dc80ede9

Change-Id: I43d6c02e55a3ae15bb38bb2d5ce71cbe5d85ce94
This commit is contained in:
David Su
2020-05-10 05:49:15 +00:00
committed by Automerger Merge Worker

View File

@@ -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>