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

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

Merge "Update idmap2_tests to really work host-side" am: 8ae23445 am: ea3212b7 am: be39416f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d62a536e70fd90c4ea68caa4ef4881d89e0f2f2
parents 01f4b0a8 be39416f

cmds/idmap2/Android.bp

+11 −4
Original line number Diff line number Diff line
@@ -132,9 +132,6 @@ cc_test { 
        "tests/XmlParserTests.cpp",

        "tests/ZipFileTests.cpp",

    ],

    required: [

        "idmap2",

    ],

    static_libs: ["libgmock"],

    target: {

        android: {
@@ -163,9 +160,19 @@ cc_test { 
            shared_libs: [

                "libz",

            ],

            data: [

                ":libz",

                ":idmap2",

            ],

        },

    },

    data: ["tests/data/**/*.apk"],

    data: [

        "tests/data/**/*.apk",

    ],

    compile_multilib: "first",

    test_options: {

        unit_test: true,

    },

}



cc_binary {

cmds/idmap2/AndroidTest.xml

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

<!-- Copyright (C) 2018 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 idmap2_tests">

    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

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

        <option name="push" value="idmap2_tests->/data/local/tmp/idmap2_tests" />

    </target_preparer>

    <option name="test-suite-tag" value="idmap2_tests" />

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

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

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

    </test>

</configuration>