commit c8c0bad8640415c3316a500deb47865013b5820c
author Joshua McCloskey <joshmccloskey@google.com> Tue May 10 05:17:44 2022 +0000
committer Joshua McCloskey <joshmccloskey@google.com> Fri May 13 21:18:10 2022 +0000
tree 318738a493492d5b2bbf2fadc62b322a9c3139cd
parent 75c685715fc5c336adad0abe87bfb1af0720c0c7

Refactored biometric libraries into common

Test: atest
Bug: 230514750
Change-Id: I47ad020004ffef9646281611a637e1a5208f5573

biometrics/fingerprint/aidl/default/Android.bp

diff --git a/biometrics/fingerprint/aidl/default/Android.bp b/biometrics/fingerprint/aidl/default/Android.bp
index 70fadfe..31fd96b 100644
--- a/biometrics/fingerprint/aidl/default/Android.bp
+++ b/biometrics/fingerprint/aidl/default/Android.bp
@@ -15,11 +15,9 @@
     vintf_fragments: ["fingerprint-example.xml"],
     local_include_dirs: ["include"],
     srcs: [
-        "CancellationSignal.cpp",
         "FakeFingerprintEngine.cpp",
         "Fingerprint.cpp",
         "Session.cpp",
-        "WorkerThread.cpp",
         "main.cpp",
     ],
     shared_libs: [
@@ -27,28 +25,16 @@
         "libbinder_ndk",
         "android.hardware.biometrics.fingerprint-V2-ndk",
         "android.hardware.biometrics.common-V2-ndk",
+        "android.hardware.biometrics.common.thread",
+        "android.hardware.biometrics.common.util",
     ],
     static_libs: ["android.hardware.biometrics.fingerprint.VirtualProps"],
 }
 
-cc_test_host {
-    name: "android.hardware.biometrics.fingerprint.WorkerThreadTest",
-    local_include_dirs: ["include"],
-    srcs: [
-        "tests/WorkerThreadTest.cpp",
-        "WorkerThread.cpp",
-    ],
-    shared_libs: [
-        "libcutils",
-    ],
-    test_suites: ["general-tests"],
-}
-
 cc_test {
     name: "android.hardware.biometrics.fingerprint.FakeFingerprintEngineTest",
     local_include_dirs: ["include"],
     srcs: [
-        "CancellationSignal.cpp",
         "tests/FakeFingerprintEngineTest.cpp",
         "FakeFingerprintEngine.cpp",
     ],
@@ -61,6 +47,7 @@
         "android.hardware.biometrics.fingerprint-V2-ndk",
         "android.hardware.biometrics.common-V2-ndk",
         "android.hardware.keymaster-V3-ndk",
+        "android.hardware.biometrics.common.util",
     ],
     vendor: true,
     test_suites: ["general-tests"],