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

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

Merge "Remove vts10 related configs" am: 8dcc0164 am: 6f8154c7 am: b78a5ccc am: c4f11746 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449315

Change-Id: Id1d502a39844625461c09ddab97d150f86a7251d
parents 4b768acc c4f11746

core/xsd/vts/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -40,7 +40,3 @@ cc_test { 
    ],

    test_config: "vts_permission_validate_test.xml",

}
 


vts_config {

    name: "VtsValidatePermission",

}

core/xsd/vts/AndroidTest.xml

deleted100644 → 0
+0 −30
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 VtsValidatePermission.">

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

    <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"/>

        <option name="push" value="DATA/etc/permission.xsd->/data/local/tmp/permission.xsd"/>

    </target_preparer>

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

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

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

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

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

        <option name="test-timeout" value="30s"/>

    </test>

</configuration>

services/core/xsd/vts/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
#

# 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.

#



LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_MODULE := VtsValidateDefaultPermissions

include test/vts/tools/build/Android.host_config.mk

services/core/xsd/vts/AndroidTest.xml

deleted100644 → 0
+0 −30
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 VtsValidateDefaultPermissions.">

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

    <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"/>

        <option name="push" value="DATA/etc/default-permissions.xsd->/data/local/tmp/default-permissions.xsd"/>

    </target_preparer>

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

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

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

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

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

        <option name="test-timeout" value="30s"/>

    </test>

</configuration>