From 31e885a47705e8a49e214dcd2c7d3c789e0d20c1 Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Mon, 23 Dec 2024 11:23:37 +0900
Subject: [PATCH] Move lyric sysconfig to vendor

This sysconfig is about the apex (com.google.pixel.camera.hal). So it
should be installed with the apex, not in /product.

Bug: 375357389
Test: SysConfigTest#testVendorApexAllowlist
Change-Id: I551870fcff576527d3fdfff3d17a5e7b0ce198a9
---
 camera/Android.bp                      | 8 ++++++++
 camera/lyric.mk                        | 1 +
 camera/vendor-apex-allowlist-lyric.xml | 9 +++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 camera/vendor-apex-allowlist-lyric.xml

diff --git a/camera/Android.bp b/camera/Android.bp
index 2c7ec58..17f152f 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -58,3 +58,11 @@ prebuilt_etc {
     init_rc: ["libg3a_ghawb.rc"],
     src: "libg3a_ghawb.rc",
 }
+
+prebuilt_etc {
+    name: "vendor-apex-allowlist-lyric.xml",
+    src: "vendor-apex-allowlist-lyric.xml",
+    vendor: true,
+    sub_dir: "sysconfig",
+    filename_from_src: true,
+}
diff --git a/camera/lyric.mk b/camera/lyric.mk
index adffb74..5d78b69 100644
--- a/camera/lyric.mk
+++ b/camera/lyric.mk
@@ -58,6 +58,7 @@ PRODUCT_PACKAGES += libg3a_standalone_ghawb_rc
 
 # Vendor APEX which contains the camera HAL
 PRODUCT_PACKAGES += com.google.pixel.camera.hal
+PRODUCT_PACKAGES += venodr-apex-allowlist-lyric.xml
 PRODUCT_PACKAGES += init.camera.set-interrupts-ownership
 PRODUCT_PACKAGES += lyric_preview_dis_xml
 
diff --git a/camera/vendor-apex-allowlist-lyric.xml b/camera/vendor-apex-allowlist-lyric.xml
new file mode 100644
index 0000000..2bcdb72
--- /dev/null
+++ b/camera/vendor-apex-allowlist-lyric.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ This XML file declares the vendor apex package names eligible for installation.
+-->
+
+<config>
+<allowed-vendor-apex package="com.google.pixel.camera.hal" installerPackage="com.google.android.GoogleCamera" />
+</config>