Merge "Update biometrics HAL interface version(1/2)" into main

This commit is contained in:
Vincent Wang
2023-12-08 16:13:34 +00:00
committed by Android (Google) Code Review
5 changed files with 16 additions and 16 deletions

View File

@@ -13,6 +13,6 @@ cc_library {
shared_libs: [
"libbase",
"libbinder_ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.common-V4-ndk",
],
}

View File

@@ -14,7 +14,7 @@ aidl_interface {
"android/hardware/biometrics/face/**/*.aidl",
],
imports: [
"android.hardware.biometrics.common-V3",
"android.hardware.biometrics.common-V4",
"android.hardware.common-V2",
"android.hardware.keymaster-V4",
],

View File

@@ -40,7 +40,7 @@ cc_binary {
],
stl: "c++_static",
static_libs: [
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.biometrics.common.thread",
"android.hardware.biometrics.common.util",
"android.hardware.biometrics.face-V4-ndk",
@@ -75,7 +75,7 @@ cc_test {
static_libs: [
"libandroid.hardware.biometrics.face.VirtualProps",
"android.hardware.biometrics.face-V4-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.keymaster-V4-ndk",
"android.hardware.biometrics.common.util",
],

View File

@@ -14,7 +14,7 @@ aidl_interface {
"android/hardware/biometrics/fingerprint/**/*.aidl",
],
imports: [
"android.hardware.biometrics.common-V3",
"android.hardware.biometrics.common-V4",
"android.hardware.keymaster-V4",
],
stability: "vintf",
@@ -50,5 +50,5 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}

View File

@@ -30,8 +30,8 @@ cc_binary {
static_libs: [
"libandroid.hardware.biometrics.fingerprint.VirtualProps",
"libbase",
"android.hardware.biometrics.fingerprint-V3-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.fingerprint-V4-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.biometrics.common.thread",
"android.hardware.biometrics.common.util",
"android.hardware.keymaster-V4-ndk",
@@ -54,8 +54,8 @@ cc_test {
],
static_libs: [
"libandroid.hardware.biometrics.fingerprint.VirtualProps",
"android.hardware.biometrics.fingerprint-V3-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.fingerprint-V4-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.keymaster-V4-ndk",
"android.hardware.biometrics.common.util",
],
@@ -80,8 +80,8 @@ cc_test {
],
static_libs: [
"libandroid.hardware.biometrics.fingerprint.VirtualProps",
"android.hardware.biometrics.fingerprint-V3-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.fingerprint-V4-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.keymaster-V4-ndk",
"android.hardware.biometrics.common.util",
],
@@ -104,8 +104,8 @@ cc_test {
],
static_libs: [
"libandroid.hardware.biometrics.fingerprint.VirtualProps",
"android.hardware.biometrics.fingerprint-V3-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.fingerprint-V4-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.keymaster-V4-ndk",
"android.hardware.biometrics.common.util",
],
@@ -130,8 +130,8 @@ cc_test {
],
static_libs: [
"libandroid.hardware.biometrics.fingerprint.VirtualProps",
"android.hardware.biometrics.fingerprint-V3-ndk",
"android.hardware.biometrics.common-V3-ndk",
"android.hardware.biometrics.fingerprint-V4-ndk",
"android.hardware.biometrics.common-V4-ndk",
"android.hardware.keymaster-V4-ndk",
"android.hardware.biometrics.common.util",
],