Merge "Add test config to minikin_perftests"

tests/perftests/Android.mk

@@ -31,6 +31,7 @@ perftest_src_files := \
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := minikin_perftests
+LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_CPPFLAGS := -Werror -Wall -Wextra
 LOCAL_SRC_FILES := $(perftest_src_files)
 LOCAL_STATIC_LIBRARIES := \

tests/perftests/AndroidTest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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="Config for minikin_perftests">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push" value="minikin_perftests->/data/benchmarktest/minikin_perftests" />
+    </target_preparer>
+    <option name="test-suite-tag" value="apct" />
+    <test class="com.android.tradefed.testtype.GoogleBenchmarkTest" >
+        <option name="native-benchmark-device-path" value="/data/benchmarktest" />
+        <option name="benchmark-module-name" value="minikin_perftests" />
+    </test>
+</configuration>