commit 4b5e5ce4066aec98057e6413c30ce0f29bae3d34
author Jeff Pu <jeffpu@google.com> Wed Sep 06 14:47:49 2023 +0000
committer Jeff Pu <jeffpu@google.com> Thu Sep 07 20:08:27 2023 +0000
tree 7c3825be4ef65febb83d1c945464febd16220dfe
parent 6824e29745e97688906ba6244952f50bb94820c4

Face Biometric Virtual HAL

Bug: 294254230
Test: Manual
Change-Id: I00813b1313510e0965cb91864163e182e10aea22

biometrics/face/aidl/default/apex/Android.bp

diff --git a/biometrics/face/aidl/default/apex/Android.bp b/biometrics/face/aidl/default/apex/Android.bp
index 2f39a08..9c031a3 100644
--- a/biometrics/face/aidl/default/apex/Android.bp
+++ b/biometrics/face/aidl/default/apex/Android.bp
@@ -17,24 +17,23 @@
 }
 
 apex_key {
-    name: "com.android.hardware.biometrics.face.key",
-    public_key: "com.android.hardware.biometrics.face.avbpubkey",
-    private_key: "com.android.hardware.biometrics.face.pem",
+    name: "com.android.hardware.biometrics.face.virtual.key",
+    public_key: "com.android.hardware.biometrics.face.virtual.avbpubkey",
+    private_key: "com.android.hardware.biometrics.face.virtual.pem",
 }
 
 android_app_certificate {
-    name: "com.android.hardware.biometrics.face.certificate",
-    certificate: "com.android.hardware.biometrics.face",
+    name: "com.android.hardware.biometrics.face.virtual.certificate",
+    certificate: "com.android.hardware.biometrics.face.virtual",
 }
 
 apex {
-    name: "com.android.hardware.biometrics.face",
+    name: "com.android.hardware.biometrics.face.virtual",
     manifest: "manifest.json",
     file_contexts: "file_contexts",
-    key: "com.android.hardware.biometrics.face.key",
-    certificate: ":com.android.hardware.biometrics.face.certificate",
+    key: "com.android.hardware.biometrics.face.virtual.key",
+    certificate: ":com.android.hardware.biometrics.face.virtual.certificate",
     updatable: false,
-
     vendor: true,
     use_vndk_as_stable: true,
 
@@ -44,11 +43,9 @@
     ],
     prebuilts: [
         // init_rc
-        "face-default-apex.rc",
+        "face-example-apex.rc",
         // vintf_fragment
-        "face-default-apex.xml",
-        // permission
-        "android.hardware.biometrics.face.prebuilt.xml",
+        "face-example-apex.xml",
     ],
 
     overrides: [
@@ -57,23 +54,21 @@
 }
 
 prebuilt_etc {
-    name: "face-default-apex.rc",
-    src: ":gen-face-default-apex.rc",
-    vendor: true,
+    name: "face-example-apex.rc",
+    src: ":gen-face-example-apex.rc",
     installable: false,
 }
 
 genrule {
-    name: "gen-face-default-apex.rc",
-    srcs: [":face-default.rc"],
-    out: ["face-default-apex.rc"],
-    cmd: "sed -e 's@/vendor/bin/@/apex/com.android.hardware.biometrics.face/bin/@' $(in) > $(out)",
+    name: "gen-face-example-apex.rc",
+    srcs: [":face-example.rc"],
+    out: ["face-example-apex.rc"],
+    cmd: "sed -e 's@/vendor/bin/@/apex/com.android.hardware.biometrics.face.virtual/bin/@' $(in) > $(out)",
 }
 
 prebuilt_etc {
-    name: "face-default-apex.xml",
-    src: ":face-default.xml",
+    name: "face-example-apex.xml",
+    src: ":face-example.xml",
     sub_dir: "vintf",
-    vendor: true,
     installable: false,
 }