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>