diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:35 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:35 -0700 |
| commit | d739e134e9d456ab202e315b3bc04afce6db0bf2 (patch) | |
| tree | 9e15bf371dd396f9533aee7e910f592d46276c82 | |
| parent | 2236205ce0d5861b327067985b5a25a66f5ff4fc (diff) | |
| parent | b14564f3b3ae7ac429680a8c38fae3bcf9dc0067 (diff) | |
| download | ims-master-cuttlefish-testing-release.tar.gz | |
Merge Android Pie into mastermaster-cuttlefish-testing-release
Bug: 112104996
Change-Id: I8f4a66437dba3c2f6c198641138224488e9a5e75
| -rw-r--r-- | rcs/presencepolling/Android.mk | 2 | ||||
| -rw-r--r-- | rcs/presencepolling/tests/AndroidTest.xml | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/rcs/presencepolling/Android.mk b/rcs/presencepolling/Android.mk index 1b84ba9..95025d6 100644 --- a/rcs/presencepolling/Android.mk +++ b/rcs/presencepolling/Android.mk @@ -39,6 +39,8 @@ LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform #LOCAL_MODULE_TAGS := optional +LOCAL_COMPATIBILITY_SUITE := device-tests + LOCAL_PROGUARD_FLAG_FILES := proguard.flags include $(BUILD_PACKAGE) diff --git a/rcs/presencepolling/tests/AndroidTest.xml b/rcs/presencepolling/tests/AndroidTest.xml index b073892..95ec9ed 100644 --- a/rcs/presencepolling/tests/AndroidTest.xml +++ b/rcs/presencepolling/tests/AndroidTest.xml @@ -15,14 +15,18 @@ ~ limitations under the License --> <configuration description="Run PresencePolling application tests."> - <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-instrumentation" /> + <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller"> + <option name="cleanup-apks" value="true" /> + <option name="test-file-name" value="PresencePolling.apk" /> <option name="test-file-name" value="PresencePollingTests.apk" /> </target_preparer> - <option name="test-suite-tag" value="apct" /> <option name="test-tag" value="PresencePollingTests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.service.ims.presence.tests" /> <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="hidden-api-checks" value="false"/> </test> </configuration> |