Merge "Add test config to JniInvocation_test"
am: 7e7c5b9a8b

Change-Id: I666833e74f70fb39e946f932b733eae2432c5d1e
diff --git a/tests/Android.bp b/tests/Android.bp
index b4d928b..523b419 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -2,6 +2,7 @@
 
 cc_test {
     name: "JniInvocation_test",
+    test_suites: ["device-tests"],
     host_supported: true,
     clang: true,
     srcs: ["JniInvocation_test.cpp"],
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
new file mode 100644
index 0000000..0f377f2
--- /dev/null
+++ b/tests/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 JniInvocation_test">
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="cleanup" value="true" />
+        <option name="push" value="JniInvocation_test->/data/local/tmp/JniInvocation_test" />
+    </target_preparer>
+    <option name="test-suite-tag" value="apct" />
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp" />
+        <option name="module-name" value="JniInvocation_test" />
+    </test>
+</configuration>
\ No newline at end of file