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

Commit 61a78b63 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8795383 from e31a5a9f to mainline-mediaprovider-release 

Change-Id: I95f0fe684fc069a45e8f9a41132de6dfbe0905d1
parents 066b5a9b e31a5a9f

Android.bp

+1 −10
Original line number Original line Diff line number Diff line
@@ -300,13 +300,6 @@ cc_library_static { 
    min_sdk_version: "29",

    min_sdk_version: "29",

}

}





filegroup {

    name: "resolv_rust_test_config_template",

    srcs: [

        "resolv_rust_test_config_template.xml",

    ],

}



filegroup {

filegroup {

    name: "resolv_test_config_template",

    name: "resolv_test_config_template",

    srcs: [

    srcs: [
@@ -366,9 +359,7 @@ rust_test { 
    edition: "2018",

    edition: "2018",

    test_suites: ["general-tests"],

    test_suites: ["general-tests"],

    auto_gen_config: true,

    auto_gen_config: true,

    // Used to enable root permission for the test.

    require_root: true,

    // TODO: remove after 'require_root' is supported in rust_test.

    test_config_template: ":resolv_rust_test_config_template",

    rustlibs: doh_rust_deps + ["libquiche_static"],

    rustlibs: doh_rust_deps + ["libquiche_static"],

    min_sdk_version: "29",

    min_sdk_version: "29",

}

}

resolv_rust_test_config_template.xml

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

<!-- Copyright (C) 2020 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="Configuration for {MODULE} Rust tests">

   <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="{MODULE}->/data/local/tmp/{MODULE}" />

   </target_preparer>

   <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >

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

       <option name="module-name" value="{MODULE}" />

   </test>

</configuration>