From 182564886703205055f388a93b94febb6476691e Mon Sep 17 00:00:00 2001 From: johnmart19 Date: Sat, 7 Jun 2025 02:44:37 +0300 Subject: [PATCH] MiuiCamera: Move Camera Extensions to system framework & add bootjar --- Android.bp | 17 ++++++++--------- camera-vendor.mk | 3 ++- .../framework/camerax-vendor-extensions.jar | Bin 3 files changed, 10 insertions(+), 10 deletions(-) rename proprietary/{system_ext => system}/framework/camerax-vendor-extensions.jar (100%) diff --git a/Android.bp b/Android.bp index a03ae3c..1c7c9ec 100644 --- a/Android.bp +++ b/Android.bp @@ -820,6 +820,14 @@ android_app_import { privileged: true, } +dex_import { + name: "camerax-vendor-extensions", + owner: "xiaomi", + jars: [ + "proprietary/system/framework/camerax-vendor-extensions.jar", + ], +} + dex_import { name: "vendor.xiaomi.hardware.misys-V1.0-java", owner: "xiaomi", @@ -852,15 +860,6 @@ dex_import { ], } -dex_import { - name: "camerax-vendor-extensions", - owner: "xiaomi", - jars: [ - "proprietary/system_ext/framework/camerax-vendor-extensions.jar", - ], - system_ext_specific: true, -} - prebuilt_etc_xml { name: "vendor.xiaomi.hardware.misys@1.0.xml", owner: "xiaomi", diff --git a/camera-vendor.mk b/camera-vendor.mk index 87ee037..0945ee5 100644 --- a/camera-vendor.mk +++ b/camera-vendor.mk @@ -68,11 +68,11 @@ PRODUCT_PACKAGES += \ vendor.xiaomi.hardware.misys@3.0 \ vendor.xiaomi.hardware.misys@4.0 \ MiuiCamera \ + camerax-vendor-extensions \ vendor.xiaomi.hardware.misys-V1.0-java \ vendor.xiaomi.hardware.misys-V2.0-java \ vendor.xiaomi.hardware.misys-V4.0-java \ vendor.xiaomi.hardware.misys.V3_0 \ - camerax-vendor-extensions \ vendor.xiaomi.hardware.misys@1.0.xml \ vendor.xiaomi.hardware.misys@2.0.xml \ vendor.xiaomi.hardware.misys@3.0.xml \ @@ -84,6 +84,7 @@ PRODUCT_PACKAGES += \ vendor.xiaomi.hardware.misys@4.0-service PRODUCT_BOOT_JARS += \ + camerax-vendor-extensions \ vendor.xiaomi.hardware.misys-V1.0-java \ vendor.xiaomi.hardware.misys-V2.0-java \ vendor.xiaomi.hardware.misys-V4.0-java \ diff --git a/proprietary/system_ext/framework/camerax-vendor-extensions.jar b/proprietary/system/framework/camerax-vendor-extensions.jar similarity index 100% rename from proprietary/system_ext/framework/camerax-vendor-extensions.jar rename to proprietary/system/framework/camerax-vendor-extensions.jar