diff options
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/tests/Android.bp | 1 | ||||
| -rw-r--r-- | libnativebridge/tests/libnativebridge-tests.xml | 41 |
2 files changed, 0 insertions, 42 deletions
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index 76c5e27104..8990cb59f9 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -106,7 +106,6 @@ cc_test { ], isolated: true, - test_config: "libnativebridge-tests.xml", srcs: [ "NativeBridgeTest.cpp", diff --git a/libnativebridge/tests/libnativebridge-tests.xml b/libnativebridge/tests/libnativebridge-tests.xml deleted file mode 100644 index d4266a7d0c..0000000000 --- a/libnativebridge/tests/libnativebridge-tests.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2021 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 libnativebridge-tests."> - <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.art.apex" /> - <option name="config-descriptor:metadata" key="mainline-param" value="com.android.art.apex" /> - - <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> - <option name="cleanup" value="true" /> - <option name="push" value="libnativebridge-tests->/data/local/tmp/libnativebridge-tests" /> - </target_preparer> - - <test class="com.android.tradefed.testtype.GTest" > - <option name="native-test-device-path" value="/data/local/tmp" /> - <option name="module-name" value="libnativebridge-tests" /> - </test> - - <!-- When this test is run in a Mainline context (e.g. with `mts-tradefed`), only enable it if - one of the Mainline modules below is present on the device used for testing. --> - <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController"> - <!-- ART Mainline Module (internal version). --> - <option name="mainline-module-package-name" value="com.google.android.art" /> - <!-- ART Mainline Module (external (AOSP) version). --> - <option name="mainline-module-package-name" value="com.android.art" /> - </object> - - <!-- Only run tests if the device under test is SDK version 31 (Android 12) or above. --> - <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk31ModuleController" /> -</configuration> |