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

Commit 96af1f70 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Disable multilib for CtsInitTestCases." am: 298f6c03 am: dccbb223 am: f224a825 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2331662



Change-Id: Idb33231f4ace4f02112a7ca8c246680c06c64933
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6574f46 f224a825

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