Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bc5fd20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove manual AndroidTest.xml for binderVendorDoubleLoadTest" am:... 

Merge "Remove manual AndroidTest.xml for binderVendorDoubleLoadTest" am: b92b235a am: 9ad97201 am: 0659aae9 am: 59ed004b am: c0f1c164

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1421701

Change-Id: Ibc39b0f003b5824e6b75023986ae7a382786deb8
parents 542cc4b7 c0f1c164

libs/binder/ndk/tests/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ cc_test { 
    ],

    test_suites: ["general-tests", "vts"],

    require_root: true,



    // force since binderVendorDoubleLoadTest has its own

    auto_gen_config: true,

}



cc_test {
@@ -90,6 +87,7 @@ cc_test { 
        "libutils",

    ],

    test_suites: ["general-tests", "vts"],

    require_root: true,

}



aidl_interface {

libs/binder/ndk/tests/AndroidTest.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 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 binderVendorDoubleLoadTest.">

    <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 class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="binderVendorDoubleLoadTest->/data/nativetest/vendor/binderVendorDoubleLoadTest" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/nativetest/vendor" />

        <option name="module-name" value="binderVendorDoubleLoadTest" />

    </test>

</configuration>