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

Commit 23040264 authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Turn off CFI for other Keymaster VTS versions" am: 4daee770 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1954816

Change-Id: I516a4468588df7371e4434d6eb0cfa68a6b1403e
parents d3f5bd34 4daee770

keymaster/3.0/vts/functional/Android.bp

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

        "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 Diff line number Diff line
@@ -48,4 +48,7 @@ cc_test { 
        "general-tests",

        "vts",

    ],

    sanitize: {

        cfi: false,

    },

}