2 files changed, 30 insertions, 0 deletions
diff --git a/app-perf-tests/Android.mk b/app-perf-tests/Android.mk
index 76af3c58e..f7d67fd08 100644
--- a/app-perf-tests/Android.mk
+++ b/app-perf-tests/Android.mk
@@ -17,6 +17,8 @@ LOCAL_USE_AAPT2 := true
 LOCAL_PACKAGE_NAME := DocumentsUIAppPerfTests
 LOCAL_INSTRUMENTATION_FOR := DocumentsUI
 
+LOCAL_COMPATIBILITY_SUITE += device-tests
+
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/app-perf-tests/AndroidTest.xml b/app-perf-tests/AndroidTest.xml
new file mode 100644
index 000000000..c8dd9a105
--- /dev/null
+++ b/app-perf-tests/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Runs DocumentsUIAppPerfTests metric instrumentation.">
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="apct-metric-instrumentation" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="DocumentsUIAppPerfTests.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="runner" value="android.test.InstrumentationTestRunner" />
+        <option name="package" value="com.android.documentsui.appperftests" />
+    </test>
+</configuration>