Merge "Add test config to binderAddInts"
diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk
index fa7629c..b43dd32 100644
--- a/tests/binder/benchmarks/Android.mk
+++ b/tests/binder/benchmarks/Android.mk
@@ -34,6 +34,7 @@
     frameworks/base/include
 
 LOCAL_MODULE := binderAddInts
+LOCAL_COMPATIBILITY_SUITE := device-tests
 LOCAL_SRC_FILES := binderAddInts.cpp
 
 include $(BUILD_NATIVE_BENCHMARK)
diff --git a/tests/binder/benchmarks/AndroidTest.xml b/tests/binder/benchmarks/AndroidTest.xml
new file mode 100644
index 0000000..9b04422
--- /dev/null
+++ b/tests/binder/benchmarks/AndroidTest.xml
@@ -0,0 +1,26 @@
+<?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 binderAddInts">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push" value="binderAddInts->/data/benchmarktest/binderAddInts" />
+    </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="binderAddInts" />
+    </test>
+</configuration>