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

Commit 4f1afe62 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Camera Provider VTS: auto-gen" am: 433f0ac4 am: 7967c1a9 am:... 

Merge "Camera Provider VTS: auto-gen" am: 433f0ac4 am: 7967c1a9 am: 576f0a3f am: 503ed3ae am: 51e389f2 am: 8953fd48

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611867



Change-Id: Icbb0a14196f0f5f496e6a6c7be310dc2e349fdd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbe3141e 8953fd48

camera/provider/aidl/vts/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,16 @@ cc_test { 
        "libgralloctypes",

        "libaidlcommonsupport",

    ],



    require_root: true,

    test_options: {

        test_runner_options: [

            {

                name: "native-test-timeout",

                value: "1800000",

            },

        ],

    },

    test_suites: [

        "general-tests",

        "vts",

camera/provider/aidl/vts/AndroidTest.xml

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

<!-- Copyright (C) 2022 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 VtsAidlHalCameraProvider_TargetTest.">

    <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="VtsAidlHalCameraProvider_TargetTest->/data/local/tmp/VtsAidlHalCameraProvider_TargetTest" />

    </target_preparer>



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

        <option name="native-test-device-path" value="/data/local/tmp" />

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

        <option name="native-test-timeout" value="1800000"/> <!-- 30 min -->

    </test>

</configuration>
 
 No newline at end of file