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

Commit 13a441b7 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "OMAPI_VNTF" am: f7a480d8 am: 89896062 am: 746c7517 am: 90f5b92d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891499

Change-Id: I16503d42817bece870ed4db438ae5d1b5f398e32
parents b7adc25a 90f5b92d

omapi/aidl/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -28,5 +28,8 @@ aidl_interface { 
        rust: {

            enabled: true,

        },

        ndk: {

            separate_platform_variant: false,

        },

    },

}

omapi/aidl/vts/functional/AccessControlApp/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ cc_test { 
    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

        "android.se.omapi-V1-ndk_platform",

        "android.se.omapi-V1-ndk",

    ],

    cflags: [

        "-O0",

omapi/aidl/vts/functional/omapi/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ cc_test { 
    ],

    static_libs: [

        "VtsHalHidlTargetTestBase",

        "android.se.omapi-V1-ndk_platform",

        "android.se.omapi-V1-ndk",

    ],

    cflags: [

        "-O0",