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

Commit e5d3eb9e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "resolv_gold_test: use compile_multilib:"both" with "32"/"64" suffixes"

parents 96b1f20b e1f88747

tests/Android.bp

+11 −3
Original line number Diff line number Diff line
@@ -114,9 +114,17 @@ cc_test { 
        "server_configurable_flags",

        "stats_proto",

    ],

    // MTS test binary can't be built under compile_multilib = "both" and having test data.

    // However, MTS coverage requires 32 bit test binary to run.

    compile_multilib: "prefer32",

    // TODO: Remove multilib after coverage test switched to 64-bit device.

    // See comments in target "resolv_test_mts_coverage_defaults".

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

}



cc_test {

tests/resolv_gold_test_config.xml

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

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

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

       <option name="append-bitness" value="true" />

   </target_preparer>

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

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

       <!-- Temporary solotuon for b/151392634 -->

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

   </target_preparer>