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

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

Merge "Remove vts10 related configs" am: 52578dda am: 95c3867d 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451616

Change-Id: I81ec699c9c40f63766970fe0a37a8d4f1b96bc61
parents 89fe40b5 95c3867d

fs_mgr/libdm/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -99,7 +99,3 @@ cc_fuzz { 
        "liblog",

    ],

}
 


vts_config {

    name: "VtsKernelLibdmTest",

}

fs_mgr/libdm/AndroidTest.xml

deleted100644 → 0
+0 −31
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="Config for VTS VtsKernelLibdmTest">

    <option name="config-descriptor:metadata" key="plan" value="vts-kernel" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">

        <option name="abort-on-push-failure" value="false"/>

        <option name="push-group" value="HostDrivenTest.push"/>

    </target_preparer>

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

      <option name="test-module-name" value="VtsKernelLibdmTest"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/libdm_test/libdm_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/libdm_test/libdm_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="1m"/>

        <option name="precondition-first-api-level" value="29" />

    </test>

</configuration>

fs_mgr/liblp/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -107,7 +107,3 @@ cc_test { 
    name: "vts_kernel_liblp_test",

    defaults: ["liblp_test_defaults"],

}
 


vts_config {

    name: "VtsKernelLiblpTest",

}

fs_mgr/liblp/AndroidTest.xml

deleted100644 → 0
+0 −31
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="Config for VTS VtsKernelLiblpTest">

    <option name="config-descriptor:metadata" key="plan" value="vts-kernel" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">

        <option name="abort-on-push-failure" value="false"/>

        <option name="push-group" value="HostDrivenTest.push"/>

    </target_preparer>

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

      <option name="test-module-name" value="VtsKernelLiblpTest"/>

        <option name="binary-test-source" value="_32bit::DATA/nativetest/vts_kernel_liblp_test/vts_kernel_liblp_test" />

        <option name="binary-test-source" value="_64bit::DATA/nativetest64/vts_kernel_liblp_test/vts_kernel_liblp_test" />

        <option name="binary-test-type" value="gtest"/>

        <option name="test-timeout" value="1m"/>

        <option name="precondition-first-api-level" value="29" />

    </test>

</configuration>

fs_mgr/libsnapshot/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -267,12 +267,6 @@ cc_test { 
    defaults: ["libsnapshot_test_defaults"],

}



// For VTS 10

vts_config {

    name: "VtsLibsnapshotTest",

    test_config: "VtsLibsnapshotTest.xml"

}



cc_binary {

    name: "snapshotctl",

    srcs: [