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

Commit 420a9136 authored by Jeff Pu's avatar Jeff Pu Committed by Android (Google) Code Review
Browse files

Merge "Bind Fingerprint Virutal HAL with IVirtual interface" into main

parents f0f09819 e0263c40

biometrics/common/aidl/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:anyapex",

                "//apex_available:platform",

            ],

        },

    },

    versions_with_info: [

        {

biometrics/common/config/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ cc_library { 
    //   SPDX-license-identifier-Apache-2.0

    name: "android.hardware.biometrics.common.config",

    export_include_dirs: ["include"],

    vendor: true,

    vendor_available: true,

    srcs: [

        "Config.cpp",

    ],
@@ -30,6 +30,10 @@ cc_library { 
        "libbase",

        "libbinder_ndk",

    ],

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}



cc_test_host {

biometrics/common/thread/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -10,10 +10,14 @@ cc_library { 
    //   SPDX-license-identifier-Apache-2.0

    name: "android.hardware.biometrics.common.thread",

    export_include_dirs: ["include"],

    vendor: true,

    vendor_available: true,

    srcs: [

        "WorkerThread.cpp",

    ],

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}



cc_test_host {

biometrics/common/util/Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ cc_library { 
    //   SPDX-license-identifier-Apache-2.0

    name: "android.hardware.biometrics.common.util",

    export_include_dirs: ["include"],

    vendor: true,

    vendor_available: true,

    srcs: [

        "CancellationSignal.cpp",

    ],
@@ -15,4 +15,8 @@ cc_library { 
        "libbinder_ndk",

        "android.hardware.biometrics.common-V4-ndk",

    ],

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}

biometrics/fingerprint/aidl/Android.bp

+36 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ aidl_interface { 
    name: "android.hardware.biometrics.fingerprint",

    vendor_available: true,

    srcs: [

        "android/hardware/biometrics/fingerprint/**/*.aidl",

        "android/hardware/biometrics/fingerprint/*.aidl",

    ],

    imports: [

        "android.hardware.biometrics.common-V4",
@@ -25,6 +25,12 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:platform",

                "//apex_available:anyapex",

            ],

        },

    },

    versions_with_info: [

        {
@@ -57,5 +63,34 @@ aidl_interface { 
        },



    ],

    frozen: true,

}



aidl_interface {

    name: "android.hardware.biometrics.fingerprint.virtualhal",

    srcs: [

        "android/hardware/biometrics/fingerprint/virtualhal/*.aidl",

    ],

    imports: [

        "android.hardware.biometrics.common-V4",

        "android.hardware.keymaster-V4",

        "android.hardware.biometrics.fingerprint-V4",

    ],

    vendor_available: true,

    unstable: true,

    backend: {

        java: {

            platform_apis: true,

        },

        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "com.android.hardware.biometrics.fingerprint.virtual",

                "//apex_available:platform",

            ],

        },

    },

    frozen: false,

}