Add RsBlasBenchmark/ImageProcessingJB to APCT metric instru

Add it to the suite version of APCT metric instru.

Test: build device-tests.zip
Bug: 77280599
Change-Id: If6607e8a4ff53487b6105baccf9357b410dee4b7

4 files changed, 56 insertions, 0 deletions

diff --git a/tests/java_api/ImageProcessing_jb/Android.mk b/tests/java_api/ImageProcessing_jb/Android.mk
index ff67a845..700906d6 100644
--- a/tests/java_api/ImageProcessing_jb/Android.mk
+++ b/tests/java_api/ImageProcessing_jb/Android.mk
@@ -21,6 +21,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 
 LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE += device-tests
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
                    $(call all-renderscript-files-under, src)
diff --git a/tests/java_api/ImageProcessing_jb/AndroidTest.xml b/tests/java_api/ImageProcessing_jb/AndroidTest.xml
new file mode 100644
index 00000000..59145567
--- /dev/null
+++ b/tests/java_api/ImageProcessing_jb/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?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 ImageProcessingJB 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="ImageProcessingJB.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.rs.imagejb" />
+    </test>
+</configuration>
diff --git a/tests/java_api/RsBLAS_Benchmark/Android.mk b/tests/java_api/RsBLAS_Benchmark/Android.mk
index 932162cd..f8b11305 100644
--- a/tests/java_api/RsBLAS_Benchmark/Android.mk
+++ b/tests/java_api/RsBLAS_Benchmark/Android.mk
@@ -21,6 +21,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
 LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
 
 LOCAL_MODULE_TAGS := tests
+LOCAL_COMPATIBILITY_SUITE += device-tests
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
 		   $(call all-renderscript-files-under, src)
diff --git a/tests/java_api/RsBLAS_Benchmark/AndroidTest.xml b/tests/java_api/RsBLAS_Benchmark/AndroidTest.xml
new file mode 100644
index 00000000..50b4ffed
--- /dev/null
+++ b/tests/java_api/RsBLAS_Benchmark/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?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 RsBlasBenchmark 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="RsBlasBenchmark.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.example.android.rs.blasbenchmark" />
+    </test>
+</configuration>