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

Commit 298f6c03 authored by David Anderson's avatar David Anderson Committed by Gerrit Code Review
Browse files

Merge "Disable multilib for CtsInitTestCases."

parents b9e18212 cbd082d4

init/Android.bp

+1 −9
Original line number Diff line number Diff line
@@ -454,15 +454,7 @@ cc_test { 
    defaults: ["init_defaults"],

    require_root: true,



    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },

    compile_multilib: "first",



    srcs: [

        "devices_test.cpp",

init/AndroidTest.xml

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

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

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

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

    </target_preparer>

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

        <option name="throw-on-error" value="false" />