diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-10 07:19:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-10 07:19:49 +0000 |
| commit | 3a4910bc0ec6f9364fc917f9a8648996753357c7 (patch) | |
| tree | 34c8115b67e82ce7eb06b70aa82e966419fe9316 | |
| parent | 134ca04896efacec10cf40ad884af42bb50aa78e (diff) | |
| parent | 908ff8b4e748bf19ca52402ed273f9dc9b242be0 (diff) | |
Snap for 6479434 from 908ff8b4e748bf19ca52402ed273f9dc9b242be0 to mainline-release
Change-Id: Id41a441eab0c9b10a5986fe4195c72352feda4ef
| -rw-r--r-- | adb/Android.bp | 2 | ||||
| -rw-r--r-- | adb/adb_test.xml | 37 |
2 files changed, 39 insertions, 0 deletions
diff --git a/adb/Android.bp b/adb/Android.bp index 0394bf6ffd..cb5c1df689 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -679,6 +679,8 @@ cc_test { "mdns_test.cpp", ], + test_config: "adb_test.xml", + shared_libs: [ "liblog", ], diff --git a/adb/adb_test.xml b/adb/adb_test.xml new file mode 100644 index 0000000000..cc3302d7be --- /dev/null +++ b/adb/adb_test.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2020 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. +--> +<!-- This test config file is auto-generated. --> +<configuration description="Runs adbd_test."> + <option name="test-suite-tag" value="apct" /> + <option name="test-suite-tag" value="apct-native" /> + + <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"> + </target_preparer> + + <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> + <option name="cleanup" value="true" /> + <option name="push" value="adbd_test->/data/local/tmp/adbd_test" /> + </target_preparer> + + <test class="com.android.tradefed.testtype.GTest" > + <option name="native-test-device-path" value="/data/local/tmp" /> + <option name="module-name" value="adbd_test" /> + </test> + + <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> + <option name="mainline-module-package-name" value="com.google.android.adbd" /> + </object> +</configuration> |