From 8a5fd04672bcd8ec52b066a7ba49ec86242b68d2 Mon Sep 17 00:00:00 2001
From: pjgowtham <pjgowtham@gmail.com>
Date: Sat, 5 Apr 2025 20:11:16 +0530
Subject: [PATCH] WIP

---
 Android.bp            | 6 ++++--
 camera-vendor.mk      | 2 +-
 opluscamera.mk        | 2 +-
 proprietary-files.txt | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 9c04192..e3e621c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -254,9 +254,10 @@ cc_prebuilt_library_shared {
 	target: {
 		android_arm64: {
 			srcs: ["proprietary/system_ext/lib64/libFileExtender-jni.so"],
-			shared_libs: ["libextendfile", "liblog", "libandroid", "libEGL", "libGLESv3", "libc", "libm", "libdl", ],
+			shared_libs: ["liblog", "libandroid", "libEGL", "libGLESv3", "libc", "libm", "libdl", ],
 		},
 	},
+	check_elf_files: false,
 	compile_multilib: "64",
 	prefer: true,
 	system_ext_specific: true,
@@ -453,7 +454,8 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-	name: "libextendfile",
+	name: "libextendfile_system_ext",
+	stem: "libextendfile",
 	owner: "oplus",
 	strip: {
 		none: true,
diff --git a/camera-vendor.mk b/camera-vendor.mk
index d602768..2375558 100644
--- a/camera-vendor.mk
+++ b/camera-vendor.mk
@@ -35,7 +35,7 @@ PRODUCT_PACKAGES += \
     libcolorx-loader \
     libcolorx \
     libcoolex \
-    libextendfile \
+    libextendfile_system_ext \
     libjni_wideselfie \
     libjnisingleblur_api \
     libjnistblur_api \
diff --git a/opluscamera.mk b/opluscamera.mk
index da4433d..a6778e5 100644
--- a/opluscamera.mk
+++ b/opluscamera.mk
@@ -23,7 +23,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.com.google.lens.oem_image_package=com.oneplus.gallery
 
 # Photo
-TARGET_USES_OPLUS_CAMERA := true
+TARGET_CAMERA_PACKAGE_NAME := com.oplus.camera
 
 # Video
 TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7cb2bf6..4254053 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -20,13 +20,14 @@ my_product/lib64/libFileExtender-jni.so:system_ext/lib64/libFileExtender-jni.so
 my_product/lib64/libOplusBlurPreviewJNI.so:system_ext/lib64/libOplusBlurPreviewJNI.so
 my_product/lib64/libSuperTextWrapper.so:system_ext/lib64/libSuperTextWrapper.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libXDocProcessSDK-jni.so:system_ext/lib64/libXDocProcessSDK-jni.so
+my_product/lib64/libXDocProcessSDK-jni.so:system_ext/lib64/libXDocProcessSDK-jni.qti.so;FIX_SONAME
 my_product/lib64/libXDocProcessSDK.so:system_ext/lib64/libXDocProcessSDK.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libYTCommon.so:system_ext/lib64/libYTCommon.so;MODULE_SUFFIX=_system_ext
 my_product/lib64/libarcsoft_wideselfie.so:system_ext/lib64/libarcsoft_wideselfie.so
 my_product/lib64/libcolorx-loader.so:system_ext/lib64/libcolorx-loader.so
 my_product/lib64/libcolorx.so:system_ext/lib64/libcolorx.so
 my_product/lib64/libcoolex.so:system_ext/lib64/libcoolex.so
-my_product/lib64/libextendfile.so:system_ext/lib64/libextendfile.so
+my_product/lib64/libextendfile.so:system_ext/lib64/libextendfile.so;MODULE_SUFFIX=system_ext
 my_product/lib64/libjni_wideselfie.so:system_ext/lib64/libjni_wideselfie.so
 my_product/lib64/libjnisingleblur_api.so:system_ext/lib64/libjnisingleblur_api.so;FIX_SONAME
 my_product/lib64/libjnistblur_api.so:system_ext/lib64/libjnistblur_api.so;FIX_SONAME