From b105faa34a6dd7601b99baa59a2ffa96252d8a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= <krzysio@google.com>
Date: Thu, 4 May 2023 05:29:28 +0000
Subject: [PATCH] Remove PRODUCT_COPY_FILES from lyric.mk.

Convert the digital image stabilization XML to prebuilt_etc rule.
Remove the stuff related to dualcamcapture, this test app has been
removed in ag/20832070.

Bug: 280523635
Bug: 280523636
Test: local build
Change-Id: I3f9f752311a349cfef486e75d0c6dcfb0fa45d5c
---
 camera/Android.bp                                     | 8 ++++++++
 camera/lyric.mk                                       | 9 +--------
 camera/vendor.android.hardware.camera.preview-dis.xml | 8 ++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 camera/vendor.android.hardware.camera.preview-dis.xml

diff --git a/camera/Android.bp b/camera/Android.bp
index 9d647c9..d615e6a 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -18,3 +18,11 @@ cc_binary {
     vendor: true,
     relative_install_path: "dump",
 }
+
+prebuilt_etc {
+    name: "lyric_preview_dis_xml",
+    vendor: true,
+    filename: "vendor.android.hardware.camera.preview-dis.xml",
+    src: "vendor.android.hardware.camera.preview-dis.xml",
+    sub_dir: "permissions",
+}
diff --git a/camera/lyric.mk b/camera/lyric.mk
index d225d3b..4a43c0f 100644
--- a/camera/lyric.mk
+++ b/camera/lyric.mk
@@ -39,12 +39,6 @@ PRODUCT_SOONG_NAMESPACES += \
 # Calibration tool for debug builds
 PRODUCT_PACKAGES_DEBUG += tarasque_test
 
-# dualcamcapture only works for GMS build. Only enable this apk for GMS userdebug/eng builds
-ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
-PRODUCT_PACKAGES_DEBUG += dualcamcapture
-PRODUCT_COPY_FILES += vendor/google/camera/devices/whi/preinstalled-packages-product-camera-device-vendor-debug.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/preinstalled-packages-product-camera-device-vendor-debug.xml
-endif
-
 endif  # vendor/google/camera check
 
 # Init-time log settings for Google 3A
@@ -55,8 +49,7 @@ PRODUCT_PACKAGES += libg3a_standalone_ghawb_rc
 # Vendor APEX which contains the camera HAL
 PRODUCT_PACKAGES += com.google.pixel.camera.hal
 PRODUCT_PACKAGES += init.camera.set-interrupts-ownership
+PRODUCT_PACKAGES += lyric_preview_dis_xml
 
 # sepolicy dir is added in dump.mk.
 # Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
-
-PRODUCT_COPY_FILES += vendor/google/services/LyricCameraHAL/src/vendor.android.hardware.camera.preview-dis.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.android.hardware.camera.preview-dis.xml
diff --git a/camera/vendor.android.hardware.camera.preview-dis.xml b/camera/vendor.android.hardware.camera.preview-dis.xml
new file mode 100644
index 0000000..ae54eef
--- /dev/null
+++ b/camera/vendor.android.hardware.camera.preview-dis.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- This is to advertise that the camera device supports preview digital image stabilization
+     in both front and back cameras-->
+<permissions>
+    <feature name="vendor.android.hardware.camera.preview-dis.front" />
+    <feature name="vendor.android.hardware.camera.preview-dis.back" />
+</permissions>