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

Commit f3e239fc authored by David Drysdale's avatar David Drysdale
Browse files

Turn off CFI for other Keymaster VTS versions 

Repeat the change for the 4.0 KeyMaster VTS tests in 3.0 and 4.1.

See previous change: I12b145dad5535846d68c97954d31a93123bb95e7

Bug: 206498742
Test: VtsHalKeymasterV4_1TargetTest, VtsHalKeymasterV3_0TargetTest
Change-Id: I3b4f9bc13e155ff451d03318d114a01abbbf138e
parent ac91c7c9

keymaster/3.0/vts/functional/Android.bp

+7 −1
Original line number Original line Diff line number Diff line
@@ -38,5 +38,11 @@ cc_test { 
        "libcrypto_static",

        "libcrypto_static",

        "libsoftkeymasterdevice",

        "libsoftkeymasterdevice",

    ],

    ],

    test_suites: ["general-tests", "vts"],

    test_suites: [

        "general-tests",

        "vts",

    ],

    sanitize: {

        cfi: false,

    },

}
 
}

keymaster/4.1/vts/functional/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -48,4 +48,7 @@ cc_test { 
        "general-tests",

        "general-tests",

        "vts",

        "vts",

    ],

    ],

    sanitize: {

        cfi: false,

    },

}
 
}