From c088612eb239ed54a4028ee0eeb343f9920deb64 Mon Sep 17 00:00:00 2001
From: Trevor Radcliffe <tradical@google.com>
Date: Thu, 9 Jun 2022 19:19:30 +0000
Subject: [PATCH] Point directly to generated c sysprop_library

Supports aosp/2119952

Bug: 226199990
Test: m
Change-Id: Ifa5725abda911f2ea4d4951d41ac54fe703ae31b
---
 biometrics/face/aidl/default/Android.bp        | 4 ++--
 biometrics/fingerprint/aidl/default/Android.bp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/biometrics/face/aidl/default/Android.bp b/biometrics/face/aidl/default/Android.bp
index 48c929bc42..63a3645c6d 100644
--- a/biometrics/face/aidl/default/Android.bp
+++ b/biometrics/face/aidl/default/Android.bp
@@ -27,7 +27,7 @@ cc_binary {
         "FakeFaceEngine.cpp",
         "Session.cpp",
     ],
-    static_libs: ["android.hardware.biometrics.face.VirtualProps"],
+    static_libs: ["libandroid.hardware.biometrics.face.VirtualProps"],
 }
 
 sysprop_library {
@@ -48,7 +48,7 @@ cc_test {
         "libbinder_ndk",
     ],
     static_libs: [
-        "android.hardware.biometrics.face.VirtualProps",
+        "libandroid.hardware.biometrics.face.VirtualProps",
         "android.hardware.biometrics.face-V2-ndk",
         "android.hardware.biometrics.common-V2-ndk",
         "android.hardware.keymaster-V3-ndk",
diff --git a/biometrics/fingerprint/aidl/default/Android.bp b/biometrics/fingerprint/aidl/default/Android.bp
index 31fd96bee0..2aa7bbd0b8 100644
--- a/biometrics/fingerprint/aidl/default/Android.bp
+++ b/biometrics/fingerprint/aidl/default/Android.bp
@@ -28,7 +28,7 @@ cc_binary {
         "android.hardware.biometrics.common.thread",
         "android.hardware.biometrics.common.util",
     ],
-    static_libs: ["android.hardware.biometrics.fingerprint.VirtualProps"],
+    static_libs: ["libandroid.hardware.biometrics.fingerprint.VirtualProps"],
 }
 
 cc_test {
@@ -43,7 +43,7 @@ cc_test {
         "libbinder_ndk",
     ],
     static_libs: [
-        "android.hardware.biometrics.fingerprint.VirtualProps",
+        "libandroid.hardware.biometrics.fingerprint.VirtualProps",
         "android.hardware.biometrics.fingerprint-V2-ndk",
         "android.hardware.biometrics.common-V2-ndk",
         "android.hardware.keymaster-V3-ndk",